From 13c612efc51cf5f8d58423c59323df13739315d6 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 17 Feb 2010 00:39:44 +0100 Subject: 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 --- src/sync-mode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/sync-mode.c') diff --git a/src/sync-mode.c b/src/sync-mode.c index ecc2f0d..c12a34a 100644 --- a/src/sync-mode.c +++ b/src/sync-mode.c @@ -497,9 +497,7 @@ static int local_handler_sync(int fd, int type, void *data) del_alarm(&STATE_SYNC(reset_cache_alarm)); dlog(LOG_NOTICE, "committing external cache"); - STATE_SYNC(external)->commit(STATE_SYNC(commit).h, fd); - /* Keep the client socket open, we want synchronous commits. */ - ret = LOCAL_RET_STOLEN; + ret = STATE_SYNC(external)->commit(STATE_SYNC(commit).h, fd); break; case RESET_TIMERS: if (!alarm_pending(&STATE_SYNC(reset_cache_alarm))) { -- cgit v1.2.3