diff options
| author | Joy Latten <latten@austin.ibm.com> | 2006-11-30 15:50:43 -0600 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-06 20:14:23 -0800 |
| commit | c9204d9ca79baac564b49d36d0228a69d7ded084 (patch) | |
| tree | 190698c8b1198eda24fa63c8bf562436e6b6fb6f /include/net | |
| parent | 161a09e737f0761ca064ee6a907313402f7a54b6 (diff) | |
| download | op-kernel-dev-c9204d9ca79baac564b49d36d0228a69d7ded084.zip op-kernel-dev-c9204d9ca79baac564b49d36d0228a69d7ded084.tar.gz | |
audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
Disables auditing in ipsec when CONFIG_AUDITSYSCALL is
disabled in the kernel.
Also includes a bug fix for xfrm_state.c as a result of
original ipsec audit patch.
Signed-off-by: Joy Latten <latten@austin.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/xfrm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index f699cdc..e476541 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -398,8 +398,13 @@ struct xfrm_audit uid_t loginuid; u32 secid; }; -void xfrm_audit_log(uid_t auid, u32 secid, int type, int result, + +#ifdef CONFIG_AUDITSYSCALL +extern void xfrm_audit_log(uid_t auid, u32 secid, int type, int result, struct xfrm_policy *xp, struct xfrm_state *x); +#else +#define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0) +#endif /* CONFIG_AUDITSYSCALL */ static inline void xfrm_pol_hold(struct xfrm_policy *policy) { |
