linux-kernel - [PATCH 2/2] Revert "netfilter: fix nf_conntrack

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <alpine.LSU.2.20.1701240058540.25515@cbobk.fhfr.pm>
Date:   Tue, 24 Jan 2017 01:06:27 +0100 (CET)
From:   Jiri Kosina <jikos@...nel.org>
To:     Pablo Neira Ayuso <pablo@...filter.org>,
        Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>,
        Florian Westphal <fw@...len.de>
cc:     netfilter-devel@...r.kernel.org, coreteam@...filter.org,
        linux-kernel@...r.kernel.org, info@...lonka.cz,
        Linus Torvalds <torvalds@...ux-foundation.org>
Subject: [PATCH 2/2] Revert "netfilter: fix nf_conntrack_helper
 documentation"

From: Jiri Kosina <jkosina@...e.cz>

This reverts commit 486dcf43da7815baa615822f3e46883ccca5400f. The commit 
that flipped the default has been reverted as well.

Signed-off-by: Jiri Kosina <jkosina@...e.cz>

---
 Documentation/networking/nf_conntrack-sysctl.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
index 497d668288f9..cdeb9d6a44c7 100644
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -62,13 +62,10 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
 	protocols.
 
 nf_conntrack_helper - BOOLEAN
-	0 - disabled (default)
-	not 0 - enabled
+	0 - disabled
+	not 0 - enabled (default)
 
 	Enable automatic conntrack helper assignment.
-	If disabled it is required to set up iptables rules to assign
-	helpers to connections.  See the CT target description in the
-	iptables-extensions(8) man page for further information.
 
 nf_conntrack_icmp_timeout - INTEGER (seconds)
 	default 30
-- 
2.11.0