[netfilter-cvslog] [conntrack-tools] only allow the use of --secmark for listing (filtering) add missing string.h required by strdup in config parsing

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=5f19f9a20d4bde74e2f95a670d766fc98c7d8684
commit 5f19f9a20d4bde74e2f95a670d766fc98c7d8684
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Thu May 22 14:32:05 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Thu May 22 14:32:05 2008 +0200

    only allow the use of --secmark for listing (filtering)
    add missing string.h required by strdup in config parsing
       via  5f19f9a20d4bde74e2f95a670d766fc98c7d8684 (commit)
      from  599e63ea72995ff36d445cd5bd9849ecdd4590ae (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 5f19f9a20d4bde74e2f95a670d766fc98c7d8684
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Thu May 22 14:32:05 2008 +0200

    only allow the use of --secmark for listing (filtering)
    add missing string.h required by strdup in config parsing

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

 ChangeLog             |    2 ++
 src/conntrack.c       |    6 +++---
 src/read_config_lex.l |    2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)
add missing string.h required by strdup in config parsing

diff --git a/ChangeLog b/ChangeLog
index 0b30f4f..e0a02a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ o check for missing source/address IP/ports in creation and get operations
 o way more flexible conntrack updates and deletions
 o fix NAT filtering via --src-nat and --dst-nat (reported by K.Oledzki)
 o recover the ID support
+o only allow the use of --secmark for listing (filtering)
 o show display counters to stderr
 o enable filtering by status and ID
 o update manpage
@@ -31,6 +32,7 @@ o use generic nfct_copy() from libnetfilter_conntrack to update objects
 o use generic nfct_cmp() to compare objects
 o improve network message sanity checkings
 o add Mcast[Snd|Rcv]SocketBuffer clauses to tune multicast socket buffers
+o add missing string.h required by strdup in config parsing
 
 version 0.9.6 (2008/03/08)
 ------------------------------
diff --git a/src/conntrack.c b/src/conntrack.c
index 8ce1dae..25a3a57 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -122,9 +122,9 @@ static char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] =
 {
           /*   s d r q p t u z e [ ] { } a m i f n g o c */
 /*CT_LIST*/   {2,2,2,2,2,0,2,2,0,0,0,0,0,0,2,0,2,2,2,2,2},
-/*CT_CREATE*/ {2,2,2,2,1,1,1,0,0,0,0,0,0,2,2,0,0,2,2,0,2},
-/*CT_UPDATE*/ {2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2},
-/*CT_DELETE*/ {2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2},
+/*CT_CREATE*/ {2,2,2,2,1,1,1,0,0,0,0,0,0,2,2,0,0,2,2,0,0},
+/*CT_UPDATE*/ {2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,0},
+/*CT_DELETE*/ {2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,0},
 /*CT_GET*/    {2,2,2,2,1,0,0,0,0,0,0,0,0,0,0,2,0,0,0,2,0},
 /*CT_FLUSH*/  {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 /*CT_EVENT*/  {2,2,2,2,2,0,0,0,2,0,0,0,0,0,2,0,0,2,2,2,2},
diff --git a/src/read_config_lex.l b/src/read_config_lex.l
index eb3368a..7daaeab 100644
--- a/src/read_config_lex.l
+++ b/src/read_config_lex.l
@@ -19,6 +19,8 @@
  * Description: configuration file syntax
  */
 
+#include <string.h>
+
 #include "read_config_yy.h"
 %}