diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-24 12:55:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-24 12:55:29 -0400 |
| commit | cde1a2ca059d892a970c57fc265261125aefe2cb (patch) | |
| tree | fdff3e5b0c06ce3da9cb973b4d28ef5f14f3ee27 | |
| parent | 10480dff01bece13fabb1d81fa847f95c3e839f0 (diff) | |
| parent | ca6aacce16ce057bab71900e078a24fcd63d250f (diff) | |
| download | tor-cde1a2ca059d892a970c57fc265261125aefe2cb.tar tor-cde1a2ca059d892a970c57fc265261125aefe2cb.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug9122 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug9122 b/changes/bug9122 new file mode 100644 index 000000000..5009da612 --- /dev/null +++ b/changes/bug9122 @@ -0,0 +1,4 @@ + o Major bugfixes: + - When receiving a new configuration file via the control port's + LOADCONF command, do not treat the defaults file as absent. + Fixes bug 9122; bugfix on 0.2.3.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index 09cbdcfbd..a47f349c2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3886,6 +3886,10 @@ options_init_from_string(const char *cf_defaults, const char *cf, newdefaultoptions = config_dup(&options_format, newoptions); } + if (newdefaultoptions == NULL) { + newdefaultoptions = config_dup(&options_format, global_default_options); + } + /* Go through command-line variables too */ retval = config_assign(&options_format, newoptions, global_cmdline_options, 0, 0, msg); |