From 2eb84066fc812388640e459e7bd20ea761d383c5 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 10 Oct 2005 20:51:53 -0700 Subject: [PATCH] --- yaml --- r: 9825 b: refs/heads/master c: f40863cec87464f3f4ec3a6c00e3fda3bbb0c91b h: refs/heads/master i: 9823: 0c96a73eda1c8d33aab7e4f1429344d575fb34b4 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/Kconfig | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d745ffe5c28..e75b4d4df35d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85d9b05d9b1edad9a2630584754720a957ab0a2a +refs/heads/master: f40863cec87464f3f4ec3a6c00e3fda3bbb0c91b diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index 4b6f80775fb0..7d917e4ce1d9 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -499,9 +499,14 @@ config IP_NF_TARGET_LOG To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_ULOG - tristate "ULOG target support" + tristate "ULOG target support (OBSOLETE)" depends on IP_NF_IPTABLES ---help--- + + This option enables the old IPv4-only "ipt_ULOG" implementation + which has been obsoleted by the new "nfnetlink_log" code (see + CONFIG_NETFILTER_NETLINK_LOG). + This option adds a `ULOG' target, which allows you to create rules in any iptables table. The packet is passed to a userspace logging daemon using netlink multicast sockets; unlike the LOG target