diff options
| author | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
| commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
| tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /security/smack/smack.h | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 4a4477f5afdc..31dce559595a 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h | |||
| @@ -178,6 +178,7 @@ u32 smack_to_secid(const char *); | |||
| 178 | extern int smack_cipso_direct; | 178 | extern int smack_cipso_direct; |
| 179 | extern int smack_net_nltype; | 179 | extern int smack_net_nltype; |
| 180 | extern char *smack_net_ambient; | 180 | extern char *smack_net_ambient; |
| 181 | extern char *smack_onlycap; | ||
| 181 | 182 | ||
| 182 | extern struct smack_known *smack_known; | 183 | extern struct smack_known *smack_known; |
| 183 | extern struct smack_known smack_known_floor; | 184 | extern struct smack_known smack_known_floor; |