diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-19 19:58:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-19 19:58:51 -0400 |
| commit | 507f07de098a14d54dfc2a2fdc603b49d563ef01 (patch) | |
| tree | 3e2f6b5ea4b0cf69768d668d8481f65528d8a457 /src/or/control.c | |
| parent | 5aad921e3a02cd96158cc54d309d072ed21b3aba (diff) | |
| parent | f5dcab8072e4f8471cc0d4d8a28c79272467fb92 (diff) | |
| download | tor-507f07de098a14d54dfc2a2fdc603b49d563ef01.tar.gz tor-507f07de098a14d54dfc2a2fdc603b49d563ef01.zip | |
Merge remote-tracking branch 'public/deprecation_v2'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index a67395e3c0..1337af4201 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -871,7 +871,8 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body, config_line_t *lines=NULL; char *start = body; char *errstring = NULL; - const int clear_first = 1; + const unsigned flags = + CAL_CLEAR_FIRST | (use_defaults ? CAL_USE_DEFAULTS : 0); char *config; smartlist_t *entries = smartlist_new(); @@ -931,7 +932,7 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body, } tor_free(config); - opt_err = options_trial_assign(lines, use_defaults, clear_first, &errstring); + opt_err = options_trial_assign(lines, flags, &errstring); { const char *msg; switch (opt_err) { |