[ulogd2] revert commit 3178606785161296dc5a1bd4d42d965db8b3e2cd

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=1d76f1ed0717e68396c8c2d7ff93c59870fa1896
commit 1d76f1ed0717e68396c8c2d7ff93c59870fa1896
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Jun 28 12:43:59 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Jun 28 12:43:59 2008 +0200

    revert commit 3178606785161296dc5a1bd4d42d965db8b3e2cd
    
    We already check for latest library version, this checking
    is not required anymore.
    
    Reported-by: Eric Leblond <eric at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  1d76f1ed0717e68396c8c2d7ff93c59870fa1896 (commit)
      from  19dfaee1d3fa166f1911b1bd057a1acc5b395e70 (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 1d76f1ed0717e68396c8c2d7ff93c59870fa1896
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sat Jun 28 12:43:59 2008 +0200

    revert commit 3178606785161296dc5a1bd4d42d965db8b3e2cd
    
    We already check for latest library version, this checking
    is not required anymore.
    
    Reported-by: Eric Leblond <eric at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 configure.in                      |    4 ----
 input/packet/ulogd_inppkt_NFLOG.c |    3 +--
 2 files changed, 1 insertions(+), 6 deletions(-)
We already check for latest library version, this checking
is not required anymore.

Reported-by: Eric Leblond <eric at inl.fr>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/configure.in b/configure.in
index 85f2152..f902792 100644
--- a/configure.in
+++ b/configure.in
@@ -41,10 +41,6 @@ PKG_CHECK_MODULES(LIBNETFILTER_CONNTRACK, libnetfilter_conntrack >= $LIBNETFILTE
 
 PKG_CHECK_MODULES(LIBNETFILTER_LOG, libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED))
 
-AC_CHECK_LIB([netfilter_log], [nflog_get_gid],
-	     AC_DEFINE_UNQUOTED([HAVE_NFLOG_GET_GID],[1],[libnetfilter_log has GID support]),,
-	     [-lnfnetlink])
-
 
 CT_CHECK_POSTGRES_DB()
 AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index 728b410..cb58661 100644
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -371,12 +371,11 @@ interp_packet(struct ulogd_pluginstance *upi, struct nflog_data *ldata)
 		ret[NFLOG_KEY_OOB_UID].u.value.ui32 = uid;
 		ret[NFLOG_KEY_OOB_UID].flags |= ULOGD_RETF_VALID;
 	}
-#ifdef HAVE_NFLOG_GET_GID
 	if (nflog_get_gid(ldata, &gid) == 0) {
 		ret[NFLOG_KEY_OOB_GID].u.value.ui32 = gid;
 		ret[NFLOG_KEY_OOB_GID].flags |= ULOGD_RETF_VALID;
 	}
-#endif
+
 	if (nflog_get_seq(ldata, &seq) == 0) {
 		ret[NFLOG_KEY_OOB_SEQ_LOCAL].u.value.ui32 = seq;
 		ret[NFLOG_KEY_OOB_SEQ_LOCAL].flags |= ULOGD_RETF_VALID;