diff options
| author | James Morris <jmorris@namei.org> | 2008-10-13 09:35:14 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-13 09:35:14 +1100 |
| commit | 93db628658197aa46bd7f83d429908b6f187ec9c (patch) | |
| tree | b09496f42570a5864212eb8cfde4ba2ea9fa7a40 /security/selinux/include/objsec.h | |
| parent | f1b2a5ace996de339292d4035f9f5b294aecd11e (diff) | |
| parent | 0da939b0058742ad2d8580b7db6b966d0fc72252 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/include/objsec.h')
| -rw-r--r-- | security/selinux/include/objsec.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 91070ab874ce..f8be8d7fa26d 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -109,16 +109,19 @@ struct netport_security_struct { }; struct sk_security_struct { - u32 sid; /* SID of this object */ - u32 peer_sid; /* SID of peer */ - u16 sclass; /* sock security class */ #ifdef CONFIG_NETLABEL enum { /* NetLabel state */ NLBL_UNSET = 0, NLBL_REQUIRE, NLBL_LABELED, + NLBL_REQSKB, + NLBL_CONNLABELED, } nlbl_state; + struct netlbl_lsm_secattr *nlbl_secattr; /* NetLabel sec attributes */ #endif + u32 sid; /* SID of this object */ + u32 peer_sid; /* SID of peer */ + u16 sclass; /* sock security class */ }; struct key_security_struct { |