linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / security / selinux / include / objsec.h

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index 9401788..54c0307 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -32,8 +32,6 @@ struct task_security_struct {
        u32 sid;             /* current SID */
        u32 exec_sid;        /* exec SID */
        u32 create_sid;      /* fscreate SID */
-       u32 keycreate_sid;   /* keycreate SID */
-       u32 sockcreate_sid;  /* fscreate SID */
        u32 ptrace_sid;      /* SID of ptrace parent */
 };
 
@@ -57,9 +55,8 @@ struct file_security_struct {
 struct superblock_security_struct {
        struct super_block *sb;         /* back pointer to sb object */
        struct list_head list;          /* list of superblock_security_struct */
-       u32 sid;                        /* SID of file system superblock */
+       u32 sid;              /* SID of file system */
        u32 def_sid;                    /* default SID for labeling */
-       u32 mntpoint_sid;               /* SECURITY_FS_USE_MNTPOINT context for files */
        unsigned int behavior;          /* labeling behavior */
        unsigned char initialized;      /* initialization flag */
        unsigned char proc;             /* proc fs */
@@ -102,11 +99,6 @@ struct sk_security_struct {
        u32 peer_sid;                   /* SID of peer */
 };
 
-struct key_security_struct {
-       struct key *obj; /* back pointer */
-       u32 sid;         /* SID of key */
-};
-
 extern unsigned int selinux_checkreqprot;
 
 #endif /* _SELINUX_OBJSEC_H_ */