From owner-p4-projects  Mon Feb  3 19:49: 0 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5F7E337B405; Mon,  3 Feb 2003 19:48:58 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 223AA37B401
	for <perforce@freebsd.org>; Mon,  3 Feb 2003 19:48:58 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BABCF43F43
	for <perforce@freebsd.org>; Mon,  3 Feb 2003 19:48:57 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h143mvbv002509
	for <perforce@freebsd.org>; Mon, 3 Feb 2003 19:48:57 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h143mvCI002506
	for perforce@freebsd.org; Mon, 3 Feb 2003 19:48:57 -0800 (PST)
Date: Mon, 3 Feb 2003 19:48:57 -0800 (PST)
Message-Id: <200302040348.h143mvCI002506@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 24632 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=24632

Change 24632 by rwatson@rwatson_tislabs on 2003/02/03 19:48:33

	Move stub mtx_{un,}lock() macros into !_KERNEL for global.h (oops).
	Have SIDTAB_TRYLOCK() return 1 indicating always success on locking
	in userland.  Merged from trustedbsd_sebsd branch.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#6 edit
.. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#6 (text+ko) ====

@@ -27,13 +27,13 @@
 MALLOC_DECLARE(M_SEBSD_SS);
 #define sebsd_malloc(a,b,c) malloc(a,b,c)
 #define sebsd_free(a,b) free(a,b)
-#define	mtx_lock(a)
-#define	mtx_unlock(a)
 #else /* _KERNEL */
 #include <stdlib.h>
 #include <errno.h>
 #define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a)
 #define sebsd_free(a,b) free(a)
+#define	mtx_lock(a)
+#define	mtx_unlock(a)
 #endif /* _KERNEL */
 
 extern int ss_initialized;

==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#9 (text+ko) ====

@@ -35,7 +35,7 @@
 #define SIDTAB_UNLOCK(s)  mtx_unlock(&(s)->sidtab_mtx)
 #else
 #define INIT_SIDTAB_LOCK(s) 
-#define SIDTAB_TRYLOCK(s) 0
+#define SIDTAB_TRYLOCK(s) 1
 #define SIDTAB_LOCK(s) 0
 #define SIDTAB_UNLOCK(s)
 #endif

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message