[conntrack-tools] define SO_[RCV|SND]BUFFORCE if not set

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=96fad1b1ca9e6e34e439cdb9eaecb765fb107ea8
commit 96fad1b1ca9e6e34e439cdb9eaecb765fb107ea8
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue May 27 20:23:19 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue May 27 20:23:19 2008 +0200

    define SO_[RCV|SND]BUFFORCE if not set

commit b21dae5470ad8dae5215c977ffe44afa8d248bf6
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue May 27 18:46:15 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue May 27 18:46:15 2008 +0200

    fix make distcheck

commit 9f0533cd09b9483aff53b340aded88d0cab32d8c
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue May 27 18:21:40 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue May 27 18:21:40 2008 +0200

    remove secmark support for conntrackd
       via  96fad1b1ca9e6e34e439cdb9eaecb765fb107ea8 (commit)
       via  b21dae5470ad8dae5215c977ffe44afa8d248bf6 (commit)
       via  9f0533cd09b9483aff53b340aded88d0cab32d8c (commit)
      from  5b6627353e2bda89aa506b4573b3fc0d0aa28668 (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 96fad1b1ca9e6e34e439cdb9eaecb765fb107ea8
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue May 27 20:23:19 2008 +0200

    define SO_[RCV|SND]BUFFORCE if not set

commit b21dae5470ad8dae5215c977ffe44afa8d248bf6
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue May 27 18:46:15 2008 +0200

    fix make distcheck

commit 9f0533cd09b9483aff53b340aded88d0cab32d8c
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue May 27 18:21:40 2008 +0200

    remove secmark support for conntrackd

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

 include/Makefile.am |    2 +-
 src/build.c         |    2 --
 src/mcast.c         |    8 ++++++++
 src/parse.c         |    1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/build.c b/src/build.c
index 6363458..be33c86 100644
--- a/src/build.c
+++ b/src/build.c
@@ -109,8 +109,6 @@ void build_netpld(struct nf_conntrack *ct, struct netpld *pld, int query)
 		__build_u32(ct, pld, ATTR_TIMEOUT);
 	if (nfct_attr_is_set(ct, ATTR_MARK))
 		__build_u32(ct, pld, ATTR_MARK);
-	if (nfct_attr_is_set(ct, ATTR_SECMARK))
-		__build_u32(ct, pld, ATTR_SECMARK);
 	if (nfct_attr_is_set(ct, ATTR_STATUS))
 		__build_u32(ct, pld, ATTR_STATUS);
 
diff --git a/src/parse.c b/src/parse.c
index 645420d..b14e487 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -66,7 +66,6 @@ static parse h[ATTR_MAX] = {
 	[ATTR_TIMEOUT]		= parse_u32,
 	[ATTR_MARK]		= parse_u32,
 	[ATTR_STATUS]		= parse_u32,
-	[ATTR_SECMARK]		= parse_u32,
 	[ATTR_MASTER_IPV4_SRC]  = parse_u32,
 	[ATTR_MASTER_IPV4_DST]  = parse_u32,
 	[ATTR_MASTER_L3PROTO]   = parse_u8,