summaryrefslogtreecommitdiffstats
path: root/src/external_inject.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-02-17 00:39:44 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2010-02-17 00:39:44 +0100
commit13c612efc51cf5f8d58423c59323df13739315d6 (patch)
tree225315aa888bacae4f458198934c8089be9c22fd /src/external_inject.c
parent8c88b695289c1f3fca604a30e3ca59dd1c957377 (diff)
conntrackd: fix `conntrackd -c' if external cache is disabled
This patch fixes a hung that occurs if you invoke `conntrackd -c' and you have disabled the external cache. Note that `conntrackd -c' does nothing since there is no entries in the external cache to be committed. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/external_inject.c')
-rw-r--r--src/external_inject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/external_inject.c b/src/external_inject.c
index a54bb13..56e24a3 100644
--- a/src/external_inject.c
+++ b/src/external_inject.c
@@ -145,8 +145,10 @@ static void external_inject_dump(int fd, int type)
{
}
-static void external_inject_commit(struct nfct_handle *h, int fd)
+static int external_inject_commit(struct nfct_handle *h, int fd)
{
+ /* close the commit socket. */
+ return LOCAL_RET_OK;
}
static void external_inject_flush(void)