diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2008-10-27 00:20:22 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2008-10-27 00:20:22 +0100 |
| commit | a98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf (patch) | |
| tree | f6c215cd05ec9278696fae7b8814b5071a4b3c6a /conf | |
| parent | a3b70dc499b64f41aa776b5b4afee5c7bfb8dfa6 (diff) | |
| parent | 1567edea8d3da7da08092eef15bb3bd4544c6464 (diff) | |
Merge branch 'dev' into out
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/conf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/conf.c b/conf/conf.c index a744dcaa..fefcac51 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -266,7 +266,7 @@ config_commit(struct config *c) } if (old_config) /* Reconfiguration already in progress */ { - if (shutting_down) + if (shutting_down == 2) { log(L_INFO "New configuration discarded due to shutdown"); config_free(c); @@ -314,8 +314,9 @@ order_shutdown(void) init_list(&c->protos); init_list(&c->tables); c->shutdown = 1; - config_commit(c); shutting_down = 1; + config_commit(c); + shutting_down = 2; } /** |