aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJoy Latten <latten@austin.ibm.com>2006-11-30 16:50:43 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-06 23:14:23 -0500
commitc9204d9ca79baac564b49d36d0228a69d7ded084 (patch)
tree190698c8b1198eda24fa63c8bf562436e6b6fb6f /include/net
parent161a09e737f0761ca064ee6a907313402f7a54b6 (diff)
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.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index f699cdcab406..e4765413cf80 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -398,8 +398,13 @@ struct xfrm_audit
398 uid_t loginuid; 398 uid_t loginuid;
399 u32 secid; 399 u32 secid;
400}; 400};
401void xfrm_audit_log(uid_t auid, u32 secid, int type, int result, 401
402#ifdef CONFIG_AUDITSYSCALL
403extern void xfrm_audit_log(uid_t auid, u32 secid, int type, int result,
402 struct xfrm_policy *xp, struct xfrm_state *x); 404 struct xfrm_policy *xp, struct xfrm_state *x);
405#else
406#define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0)
407#endif /* CONFIG_AUDITSYSCALL */
403 408
404static inline void xfrm_pol_hold(struct xfrm_policy *policy) 409static inline void xfrm_pol_hold(struct xfrm_policy *policy)
405{ 410{