diff options
author | Michael Adam <obnox@samba.org> | 2010-03-02 21:57:03 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2010-03-02 21:57:03 +0100 |
commit | 2235a97f05faace446afe7c59dee8f32e69eee67 (patch) | |
tree | 83981d9594614bc02813d33e7aa4fc89caa2e856 /src | |
parent | f923649a1143f2fd88fe39af532a2951aae8a95a (diff) | |
download | tinyproxy-2235a97f05faace446afe7c59dee8f32e69eee67.tar.gz tinyproxy-2235a97f05faace446afe7c59dee8f32e69eee67.zip |
main: separate loading of config and setup_logging at startup
This is the first part of a fix for bug #74
(making reloading of config work if running as non-privileged user)
Michael
Diffstat (limited to 'src')
-rw-r--r-- | src/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -386,7 +386,14 @@ main (int argc, char **argv) log_message (LOG_INFO, "Initializing " PACKAGE " ..."); - ret = reload_config (); + ret = reload_config_file (config_defaults.config_file, + &config, + &config_defaults); + if (ret != 0) { + exit (EX_SOFTWARE); + } + + ret = setup_logging (); if (ret != 0) { exit (EX_SOFTWARE); } |