diff options
author | Joy Latten <latten@austin.ibm.com> | 2006-11-30 16:50:43 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-06 23:14:23 -0500 |
commit | c9204d9ca79baac564b49d36d0228a69d7ded084 (patch) | |
tree | 190698c8b1198eda24fa63c8bf562436e6b6fb6f /net/xfrm/xfrm_policy.c | |
parent | 161a09e737f0761ca064ee6a907313402f7a54b6 (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 'net/xfrm/xfrm_policy.c')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 47c13649bac1..140bb9b384ac 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -1986,6 +1986,7 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, | |||
1986 | 1986 | ||
1987 | EXPORT_SYMBOL(xfrm_bundle_ok); | 1987 | EXPORT_SYMBOL(xfrm_bundle_ok); |
1988 | 1988 | ||
1989 | #ifdef CONFIG_AUDITSYSCALL | ||
1989 | /* Audit addition and deletion of SAs and ipsec policy */ | 1990 | /* Audit addition and deletion of SAs and ipsec policy */ |
1990 | 1991 | ||
1991 | void xfrm_audit_log(uid_t auid, u32 sid, int type, int result, | 1992 | void xfrm_audit_log(uid_t auid, u32 sid, int type, int result, |
@@ -2094,6 +2095,7 @@ void xfrm_audit_log(uid_t auid, u32 sid, int type, int result, | |||
2094 | } | 2095 | } |
2095 | 2096 | ||
2096 | EXPORT_SYMBOL(xfrm_audit_log); | 2097 | EXPORT_SYMBOL(xfrm_audit_log); |
2098 | #endif /* CONFIG_AUDITSYSCALL */ | ||
2097 | 2099 | ||
2098 | int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) | 2100 | int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) |
2099 | { | 2101 | { |