diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 08:16:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 08:16:48 -0700 |
| commit | 732b72069e77f288efa1d5245cc699d7cb98e528 (patch) | |
| tree | 5f908da2b5b9732a99cf8a8b01a13b3c33cffd5a /security/selinux/include/security.h | |
| parent | 97c7d1ea1f80f457da78b11ca638b7096a4548ee (diff) | |
| parent | 089be43e403a78cd6889cde2fba164fefe9dfd89 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
Revert "SELinux: allow fstype unknown to policy to use xattrs if present"
Diffstat (limited to 'security/selinux/include/security.h')
| -rw-r--r-- | security/selinux/include/security.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 44cba2e21dc..7c543003d65 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -136,7 +136,7 @@ int security_get_allow_unknown(void); #define SECURITY_FS_USE_MNTPOINT 6 /* use mountpoint labeling */ int security_fs_use(const char *fstype, unsigned int *behavior, - u32 *sid, bool can_xattr); + u32 *sid); int security_genfs_sid(const char *fstype, char *name, u16 sclass, u32 *sid); |