upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index d1516e4..887937c 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -87,6 +87,12 @@ struct bprm_security_struct {
        struct linux_binprm *bprm;     /* back pointer to bprm object */
        u32 sid;                       /* SID for transformed process */
        unsigned char set;
+
+       /*
+        * unsafe is used to share failure information from bprm_apply_creds()
+        * to bprm_post_apply_creds().
+        */
+       char unsafe;
 };
 
 struct netif_security_struct {
@@ -101,6 +107,6 @@ struct sk_security_struct {
        u32 peer_sid;                   /* SID of peer */
 };
 
-extern int inode_security_set_sid(struct inode *inode, u32 sid);
+extern unsigned int selinux_checkreqprot;
 
 #endif /* _SELINUX_OBJSEC_H_ */