diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /security/selinux/ss/mls.h | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'security/selinux/ss/mls.h')
| -rw-r--r-- | security/selinux/ss/mls.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h index 0d37beaa85e2..03de697c8058 100644 --- a/security/selinux/ss/mls.h +++ b/security/selinux/ss/mls.h | |||
| @@ -23,7 +23,9 @@ int mls_context_isvalid(struct policydb *p, struct context *c); | |||
| 23 | 23 | ||
| 24 | int mls_context_to_sid(char oldc, | 24 | int mls_context_to_sid(char oldc, |
| 25 | char **scontext, | 25 | char **scontext, |
| 26 | struct context *context); | 26 | struct context *context, |
| 27 | struct sidtab *s, | ||
| 28 | u32 def_sid); | ||
| 27 | 29 | ||
| 28 | int mls_convert_context(struct policydb *oldp, | 30 | int mls_convert_context(struct policydb *oldp, |
| 29 | struct policydb *newp, | 31 | struct policydb *newp, |