PERFORCE change 111018 for review

[Todd Miller]

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

Change 111018 by millert at millert_g5tower on 2006/12/04 16:33:55

	Move mac_vnode_label_associate_extattr() proto to proper location.
	Fix compiler warning caused by global variable buf.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#22 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#22 (text+ko) ====

@@ -141,7 +141,7 @@
 	    int *prot);
 int	mac_file_check_receive(struct ucred *cred, struct fileglob *fg);
 int	mac_file_check_set(struct ucred *cred, struct fileglob *fg,
-	    char *buf, int buflen);
+	    char *bufp, int buflen);
 void	mac_file_label_associate(struct ucred *cred, struct fileglob *fg);
 void	mac_file_label_destroy(struct fileglob *fg);
 void	mac_file_label_init(struct fileglob *fg);
@@ -391,9 +391,9 @@
 	    vfs_context_t ctx);
 void	mac_vnode_label_associate_devfs(struct mount *mp, struct devnode *de,
 	    struct vnode *vp);
+int	mac_vnode_label_associate_extattr(struct mount *mp, struct vnode *vp);
 int	mac_vnode_label_associate_fdesc(struct mount *mp, struct fdescnode *fnp,
 	    struct vnode *vp, vfs_context_t ctx);
-int	mac_vnode_label_associate_extattr(struct mount *mp, struct vnode *vp);
 void	mac_vnode_label_associate_singlelabel(struct mount *mp,
 	    struct vnode *vp);
 void	mac_vnode_label_copy(struct label *l1, struct label *l2);