aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_state.c
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 /net/xfrm/xfrm_state.c
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 'net/xfrm/xfrm_state.c')
-rw-r--r--net/xfrm/xfrm_state.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index d5d3a6f1f609..fdb08d9f34aa 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -407,7 +407,6 @@ restart:
407 xfrm_state_hold(x); 407 xfrm_state_hold(x);
408 spin_unlock_bh(&xfrm_state_lock); 408 spin_unlock_bh(&xfrm_state_lock);
409 409
410 xfrm_state_delete(x);
411 err = xfrm_state_delete(x); 410 err = xfrm_state_delete(x);
412 xfrm_audit_log(audit_info->loginuid, 411 xfrm_audit_log(audit_info->loginuid,
413 audit_info->secid, 412 audit_info->secid,