[conntrack-tools] cleanup: remove some debug messages from sync-ftfw.c

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=c131d10ce84b5c7b51893cbf933b32967b74314f
commit c131d10ce84b5c7b51893cbf933b32967b74314f
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Wed Sep 17 13:12:51 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Sep 17 13:12:51 2008 +0200

    cleanup: remove some debug messages from sync-ftfw.c
    
    Remove useless debug messages, now we have a pluging for tcpdump to
    debug the FT-FW protocol.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit fc5c992b7010a733250633d55c4a6ab4932a7125
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Wed Sep 17 13:07:54 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Sep 17 13:07:54 2008 +0200

    filter: check if kernel-space filtering is available
    
    Check if the Linux kernel is >= 2.6.26, otherwise it does not support
    kernel-space filtering. This is not clean but we have no choice, the BSF
    infrastructure does not return ENOTSUPP for unsupported operations.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit bfa809f6c809f30706a9718506e7a575d44052a6
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Wed Sep 17 12:45:34 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Sep 17 12:45:34 2008 +0200

    cleanup: Linux kernel version checking
    
    Minor cleanup to save a couple of lines in the Linux kernel version
    checking.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  c131d10ce84b5c7b51893cbf933b32967b74314f (commit)
       via  fc5c992b7010a733250633d55c4a6ab4932a7125 (commit)
       via  bfa809f6c809f30706a9718506e7a575d44052a6 (commit)
      from  587a85e0603d514656a434d44c82d1fdacd5e326 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c131d10ce84b5c7b51893cbf933b32967b74314f
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Wed Sep 17 13:12:51 2008 +0200

    cleanup: remove some debug messages from sync-ftfw.c
    
    Remove useless debug messages, now we have a pluging for tcpdump to
    debug the FT-FW protocol.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit fc5c992b7010a733250633d55c4a6ab4932a7125
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Wed Sep 17 13:07:54 2008 +0200

    filter: check if kernel-space filtering is available
    
    Check if the Linux kernel is >= 2.6.26, otherwise it does not support
    kernel-space filtering. This is not clean but we have no choice, the BSF
    infrastructure does not return ENOTSUPP for unsupported operations.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit bfa809f6c809f30706a9718506e7a575d44052a6
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Wed Sep 17 12:45:34 2008 +0200

    cleanup: Linux kernel version checking
    
    Minor cleanup to save a couple of lines in the Linux kernel version
    checking.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 include/conntrackd.h |    1 +
 src/main.c           |    9 ++++-----
 src/netlink.c        |   17 +++++++----------
 src/sync-ftfw.c      |   39 ++++++++-------------------------------
 4 files changed, 20 insertions(+), 46 deletions(-)
Minor cleanup to save a couple of lines in the Linux kernel version
checking.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/main.c b/src/main.c
index a4c5451..7360b77 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,12 +90,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 	sscanf(u.release, "%d.%d.%d", &version, &major, &minor);
-	if (version < 2 && major < 6) {
-		fprintf(stderr, "Linux kernel version must be >= 2.6.18\n");
-		exit(EXIT_FAILURE);
-	}
-
-	if (major == 6 && minor < 18) {
+	if (version < 2 && major < 6 && minor < 18) {
 		fprintf(stderr, "Linux kernel version must be >= 2.6.18\n");
 		exit(EXIT_FAILURE);
 	}