diff options
| author | James Morris <jmorris@namei.org> | 2010-03-01 09:36:31 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-01 09:36:31 +1100 |
| commit | b4ccebdd37ff70d349321a198f416ba737a5e833 (patch) | |
| tree | 275d717070346722c3aacd8355fb4f743216e03b /security/smack | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| parent | ef57471a73b67a7b65fd8708fd55c77cb7c619af (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 529c9ca65878..a5721b373f53 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp) * * Returns 0 on success, error code otherwise. */ -static int smack_syslog(int type) +static int smack_syslog(int type, bool from_file) { int rc; char *sp = current_security(); - rc = cap_syslog(type); + rc = cap_syslog(type, from_file); if (rc != 0) return rc; |