diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-19 17:51:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 17:51:37 -0500 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /kernel/audit.c | |
| parent | f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (diff) | |
| parent | a5db219f4cf9f67995eabd53b81a1232c82f5852 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 5842f65bedcb..162e88e33bc9 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -402,7 +402,7 @@ static void kauditd_send_skb(struct sk_buff *skb) | |||
| 402 | if (err < 0) { | 402 | if (err < 0) { |
| 403 | BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */ | 403 | BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */ |
| 404 | printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid); | 404 | printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid); |
| 405 | audit_log_lost("auditd dissapeared\n"); | 405 | audit_log_lost("auditd disappeared\n"); |
| 406 | audit_pid = 0; | 406 | audit_pid = 0; |
| 407 | /* we might get lucky and get this in the next auditd */ | 407 | /* we might get lucky and get this in the next auditd */ |
| 408 | audit_hold_skb(skb); | 408 | audit_hold_skb(skb); |