[PATCH 2/5] NETFILTER: Add missing PPTP dependency

[Harald Welte]

Hi Dave,

please apply this trivial documentation-only update to your tree:

[NETFILTER] ipt_ULOG: Mark ipt_ULOG as OBSOLETE

Similar to nfnetlink_queue and ip_queue, we mark ipt_ULOG as obsolete.
This should have been part of the original nfnetlink_log merge, but
I somehow missed it.

Signed-off-by: Harald Welte <laforge at netfilter.org>

---
commit 2e64e94fe8e7e4630c9d9e66c437f3ba81e99f78
tree b97a83da44063bfdb4b43c4805e15dbfb1a01ecf
parent 1170becbdb829a1e1120d93bc56b3ffe1a8ef22a
author Harald Welte <laforge at netfilter.org> Sat, 08 Oct 2005 01:02:05 +0200
committer Harald Welte <laforge at netfilter.org> Sat, 08 Oct 2005 01:02:05 +0200

 net/ipv4/netfilter/Kconfig |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
--- a/net/ipv4/netfilter/Kconfig
+++ b/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
-- 
- Harald Welte <laforge at netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : /pipermail/netfilter-devel/attachments/20051010/a3c6bdd0/attachment-0001.pgp