[conntrack-tools] conntrackd: fix return value in notrack_local()

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Thu Sep 17 16:11:20 CEST 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=530eed5796faa5fd16c39743a4516bef0e26449c
commit 530eed5796faa5fd16c39743a4516bef0e26449c
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Thu Sep 17 16:10:43 2009 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Thu Sep 17 16:10:43 2009 +0200

    conntrackd: fix return value in notrack_local()
    
    In 9406f29b89f6727c3db5485d109466701393b4d4, we added different
    return values for the UNIX sockets that we use to extract the
    daemon statistics. Unfortunately, I forgot to change this
    as well. This patch fixes a problem that blocks the client
    socket indefinitely.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  530eed5796faa5fd16c39743a4516bef0e26449c (commit)
      from  189dbc5853ce73448ca0d2423bbac3aa23712478 (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 530eed5796faa5fd16c39743a4516bef0e26449c
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Thu Sep 17 16:10:43 2009 +0200

    conntrackd: fix return value in notrack_local()
    
    In 9406f29b89f6727c3db5485d109466701393b4d4, we added different
    return values for the UNIX sockets that we use to extract the
    daemon statistics. Unfortunately, I forgot to change this
    as well. This patch fixes a problem that blocks the client
    socket indefinitely.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 src/sync-notrack.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
In 9406f29b89f6727c3db5485d109466701393b4d4, we added different
return values for the UNIX sockets that we use to extract the
daemon statistics. Unfortunately, I forgot to change this
as well. This patch fixes a problem that blocks the client
socket indefinitely.

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

diff --git a/src/sync-notrack.c b/src/sync-notrack.c
index 6502bcd..14ecde5 100644
--- a/src/sync-notrack.c
+++ b/src/sync-notrack.c
@@ -77,7 +77,7 @@ static int do_cache_to_tx(void *data1, void *data2)
 
 static int notrack_local(int fd, int type, void *data)
 {
-	int ret = 1;
+	int ret = LOCAL_RET_OK;
 
 	switch(type) {
 	case REQUEST_DUMP:



More information about the netfilter-cvslog mailing list