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); }