From owner-p4-projects@FreeBSD.ORG Wed Jul 6 15:43:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1EEB16A425; Wed, 6 Jul 2005 15: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 B98AA16A423 for ; Wed, 6 Jul 2005 15: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 8FF5043D45 for ; Wed, 6 Jul 2005 15:43: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 j66Fh5ZK018566 for ; Wed, 6 Jul 2005 15:43: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 j66Fh5fv018563 for perforce@freebsd.org; Wed, 6 Jul 2005 15:43:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 6 Jul 2005 15:43:05 GMT Message-Id: <200507061543.j66Fh5fv018563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79660 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2005 15:43:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=79660 Change 79660 by rwatson@rwatson_zoo on 2005/07/06 15:42:28 Export mac_mount_label_alloc(), mac_mount_label_free(), and mac_externalize_mount_label() outside of the MAC Framework so that it can be used by the nmount(2) code. We may wish to expose less of this once we've made it work as desired. These changes are required for the vfs_mount.c stubbed out nmount() label code to compile (and work?). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_internal.h#14 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#21 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_internal.h#14 (text+ko) ==== @@ -108,8 +108,6 @@ * the namespaces, etc, should work for these, so for now, sort by * object type. */ -struct label *mac_mount_label_alloc(void); -void mac_mount_label_free(struct label *label); struct label *mac_pipe_label_alloc(void); void mac_pipe_label_free(struct label *label); struct label *mac_socket_label_alloc(int flag); @@ -125,7 +123,6 @@ int mac_externalize_mount_label(struct label *label, char *elements, char *outbuf, size_t outbuflen, int flags); -int mac_internalize_mount_label(struct label *label, char *string); void mac_copy_pipe_label(struct label *src, struct label *dest); int mac_externalize_pipe_label(struct label *label, char *elements, ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#21 (text+ko) ==== @@ -191,6 +191,10 @@ struct label *mac_cred_label_alloc(void); void mac_cred_label_free(struct label *label); +struct label *mac_mount_label_alloc(void); +void mac_mount_label_free(struct label *label); +int mac_internalize_mount_label(struct label *label, + char *string); struct label *mac_vnode_label_alloc(void); void mac_vnode_label_free(struct label *label);