Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Jul 2002 13:08:13 -0700 (PDT)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 14546 for review
Message-ID:  <200207202008.g6KK8D30006186@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14546

Change 14546 by rwatson@rwatson_curry on 2002/07/20 13:08:09

	mac_bsdextended apparently missed the move to 'struct label'
	from 'struct mac', but since it's an unlabeled policy, it didn't
	make a difference.  Fix.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#35 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#35 (text+ko) ====

@@ -290,7 +290,7 @@
 
 static int
 mac_bsdextended_cred_check_access_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label, mode_t flags)
+    struct label *label, mode_t flags)
 {
 	struct vattr vap;
 	int error;
@@ -306,7 +306,7 @@
 
 static int
 mac_bsdextended_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp,
-    struct mac *dlabel)
+    struct label *dlabel)
 {
 	struct vattr vap;
 	int error;
@@ -322,7 +322,7 @@
 
 static int
 mac_bsdextended_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp,
-    struct mac *dlabel)
+    struct label *dlabel)
 {
 	struct vattr vap;
 	int error;
@@ -338,7 +338,7 @@
 
 static int
 mac_bsdextended_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp,
-    struct mac *dlabel, struct vattr *vap)
+    struct label *dlabel, struct vattr *vap)
 {
 	struct vattr dvap;
 	int error;
@@ -354,7 +354,7 @@
 
 static int
 mac_bsdextended_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp,
-    struct mac *dlabel, struct vnode *vp, struct mac *label)
+    struct label *dlabel, struct vnode *vp, struct label *label)
 {
 	struct vattr vap;
 	int error;
@@ -393,7 +393,7 @@
 
 static int
 mac_bsdextended_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label)
+    struct label *label)
 {
 	struct vattr vap;
 	int error;
@@ -426,7 +426,7 @@
 
 static int
 mac_bsdextended_cred_check_getextattr_vnode(struct ucred *cred,
-    struct vnode *vp, struct mac *label, int attrnamespace,
+    struct vnode *vp, struct label *label, int attrnamespace,
     const char *name, struct uio *uio)
 {
 	struct vattr vap;
@@ -443,7 +443,7 @@
 
 static int
 mac_bsdextended_cred_check_open_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *filelabel, mode_t acc_mode)
+    struct label *filelabel, mode_t acc_mode)
 {
 	struct vattr vap;
 	int error;
@@ -491,7 +491,7 @@
 
 static int
 mac_bsdextended_cred_check_rename_from_vnode(struct ucred *cred,
-    struct vnode *dvp, struct mac *dlabel, struct vnode *vp, struct mac *label)
+    struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label)
 {
 	struct vattr vap;
 	int error;
@@ -515,7 +515,7 @@
 
 static int
 mac_bsdextended_cred_check_rename_to_vnode(struct ucred *cred,
-    struct vnode *dvp, struct mac *dlabel, struct vnode *vp, struct mac *label,
+    struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label,
     int samedir)
 {
 	struct vattr vap;
@@ -544,7 +544,7 @@
 
 static int
 mac_bsdextended_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label)
+    struct label *label)
 {
 	struct vattr vap;
 	int error;
@@ -560,7 +560,7 @@
 
 static int
 mac_bsdextended_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp,
-    struct mac *dlabel)
+    struct label *dlabel)
 {
 	struct vattr vap;
 	int error;
@@ -592,7 +592,7 @@
 
 static int
 mac_bsdextended_cred_check_setextattr_vnode(struct ucred *cred,
-    struct vnode *vp, struct mac *label, int attrnamespace, const char *name,
+    struct vnode *vp, struct label *label, int attrnamespace, const char *name,
     struct uio *uio)
 {
 	struct vattr vap;
@@ -609,7 +609,7 @@
 
 static int
 mac_bsdextended_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label, u_long flags)
+    struct label *label, u_long flags)
 {
 	struct vattr vap;
 	int error;
@@ -625,7 +625,7 @@
 
 static int
 mac_bsdextended_cred_check_setmode_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label, mode_t mode)
+    struct label *label, mode_t mode)
 {
 	struct vattr vap;
 	int error;
@@ -641,7 +641,7 @@
 
 static int
 mac_bsdextended_cred_check_setowner_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label, uid_t uid, gid_t gid)
+    struct label *label, uid_t uid, gid_t gid)
 {
 	struct vattr vap;
 	int error;
@@ -657,7 +657,7 @@
 
 static int
 mac_bsdextended_cred_check_setutimes_vnode(struct ucred *cred,
-    struct vnode *vp, struct mac *label, struct timespec atime,
+    struct vnode *vp, struct label *label, struct timespec atime,
     struct timespec utime)
 {
 	struct vattr vap;
@@ -674,7 +674,7 @@
 
 static int
 mac_bsdextended_cred_check_stat_vnode(struct ucred *cred, struct vnode *vp,
-    struct mac *label)
+    struct label *label)
 {
 	struct vattr vap;
 	int error;

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207202008.g6KK8D30006186>