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 /net/xfrm/xfrm_state.c | |
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 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index d5d3a6f..fdb08d9 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -407,7 +407,6 @@ restart: xfrm_state_hold(x); spin_unlock_bh(&xfrm_state_lock); - xfrm_state_delete(x); err = xfrm_state_delete(x); xfrm_audit_log(audit_info->loginuid, audit_info->secid, |