PERFORCE change 41228 for review

[ Available lists | Index of p4-projects | Month of Nov 2003 | Week of 3 Nov 2003 | Raw email | View thread | Wrap long lines | Reply | Tag ]
From
Robert Watson <rwatson@FreeBSD.org>
Date
3 Nov 2003 12:11:55
Subject
PERFORCE change 41228 for review
Message-ID
200311032011.hA3KBrwP079327@repoman.freebsd.org


[ Hide this part ]
http://perforce.freebsd.org/chv.cgi?CH=41228

Change 41228 by rwatson@rwatson_tislabs on 2003/11/03 12:10:55

Synchronize to version comitted to main FreeBSD tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#9 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#9 (text+ko) ====

@@ -32,6 +32,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: src/sys/security/mac/mac_internal.h,v 1.103 2003/10/25 15:28:20 rwatson Exp $
*/

/*
@@ -48,6 +50,7 @@
* MAC Framework global types and typedefs.
*/
LIST_HEAD(mac_policy_list_head, mac_policy_conf);
+MALLOC_DECLARE(M_MACTEMP);

/*
* MAC Framework global variables.
@@ -63,11 +66,6 @@
#endif

/*
- * MAC Framework global types and constants.
- */
-MALLOC_DECLARE(M_MACTEMP);
-
-/*
* MAC Framework object/access counter primitives, conditionally
* compiled.
*/
@@ -109,7 +107,6 @@
int mac_internalize_cred_label(struct label *label, char *string);
void mac_relabel_cred(struct ucred *cred, struct label *newlabel);

-
void mac_copy_pipe_label(struct label *src, struct label *dest);
void mac_destroy_pipe_label(struct label *label);
int mac_externalize_pipe_label(struct label *label, char *elements,


Elapsed time: 0.157 seconds