diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-02-17 00:39:44 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-02-17 00:39:44 +0100 |
| commit | 13c612efc51cf5f8d58423c59323df13739315d6 (patch) | |
| tree | 225315aa888bacae4f458198934c8089be9c22fd /src/sync-mode.c | |
| parent | 8c88b695289c1f3fca604a30e3ca59dd1c957377 (diff) | |
| download | conntrack-tools-13c612efc51cf5f8d58423c59323df13739315d6.tar.gz conntrack-tools-13c612efc51cf5f8d58423c59323df13739315d6.zip | |
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/sync-mode.c')
| -rw-r--r-- | src/sync-mode.c | 4 |
1 files changed, 1 insertions, 3 deletions
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))) { |