---

yaml --- r: 285027 b: refs/heads/master c: 02f5daa h: refs/heads/master i: 285025: 329bee6 285023: f797c2f v: v3
git-mirror · Jan 5, 2012 · c761a24 · c761a24
1 parent d02331e
commit c761a24
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a65a3f67f8a85802c0a0250e48c4c4652d0da0
+refs/heads/master: 02f5daa563456c1ff3c3422aa3ec00e67460f762
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
@@ -92,7 +92,6 @@
 
 #define NUM_SEL_MNT_OPTS 5
 
-extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
 extern struct security_operations *security_ops;
 
 /* SECMARK reference count */

diff --git a/trunk/security/selinux/include/security.h b/trunk/security/selinux/include/security.h
@@ -221,6 +221,9 @@ extern int selinux_disable(void);
 extern void exit_sel_fs(void);
 extern struct dentry *selinux_null;
 extern struct vfsmount *selinuxfs_mount;
+extern void selnl_notify_setenforce(int val);
+extern void selnl_notify_policyload(u32 seqno);
+extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
 
 #endif /* _SELINUX_SECURITY_H_ */
 
diff --git a/trunk/security/selinux/netlink.c b/trunk/security/selinux/netlink.c
@@ -19,6 +19,8 @@
 #include <linux/selinux_netlink.h>
 #include <net/net_namespace.h>
 
+#include "security.h"
+
 static struct sock *selnl;
 
 static int selnl_msglen(int msgtype)

diff --git a/trunk/security/selinux/nlmsgtab.c b/trunk/security/selinux/nlmsgtab.c
@@ -21,6 +21,7 @@
 
 #include "flask.h"
 #include "av_permissions.h"
+#include "security.h"
 
 struct nlmsg_perm {
 	u16	nlmsg_type;

diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c
@@ -75,8 +75,6 @@ static char policy_opened;
 /* global data for policy capabilities */
 static struct dentry *policycap_dir;
 
-extern void selnl_notify_setenforce(int val);
-
 /* Check whether a task is allowed to use a security operation. */
 static int task_has_security(struct task_struct *tsk,
 			     u32 perms)

diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c
@@ -70,8 +70,6 @@
 #include "ebitmap.h"
 #include "audit.h"
 
-extern void selnl_notify_policyload(u32 seqno);
-
 int selinux_policycap_netpeer;
 int selinux_policycap_openperm;