diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-22 02:43:41 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-22 02:48:44 +0100 |
| commit | 0aeac9cb7f9887374ce0258c8653f9518529bf08 (patch) | |
| tree | 2d16e0904be1658c08a4c779cf4132bc8bf20efa /sysdep/unix/main.c | |
| parent | 8931425d02dd8656b48142f608d3119ab6f4a96f (diff) | |
| parent | 7c9930f9c8feb3b08f7a9e94a08807ccbbc096f5 (diff) | |
Merge commit 'origin/bfd'
Diffstat (limited to 'sysdep/unix/main.c')
| -rw-r--r-- | sysdep/unix/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index 165dab2b..7a945826 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -199,7 +199,7 @@ unix_read_config(struct config **cp, char *name) return ret; } -static void +static struct config * read_config(void) { struct config *conf; @@ -211,7 +211,8 @@ read_config(void) else die("Unable to open configuration file %s: %m", config_name); } - config_commit(conf, RECONFIG_HARD, 0); + + return conf; } void @@ -776,7 +777,7 @@ main(int argc, char **argv) proto_build(&proto_unix_kernel); proto_build(&proto_unix_iface); - read_config(); + struct config *conf = read_config(); if (parse_and_exit) exit(0); @@ -800,6 +801,8 @@ main(int argc, char **argv) signal_init(); + config_commit(conf, RECONFIG_HARD, 0); + #ifdef LOCAL_DEBUG async_dump_flag = 1; #endif |