mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge branch 'bug3743'
This commit is contained in:
+8
-4
@@ -718,10 +718,14 @@ set_options(or_options_t *new_val, char **msg)
|
||||
if (old_options) {
|
||||
elements = smartlist_create();
|
||||
for (i=0; options_format.vars[i].name; ++i) {
|
||||
if (!option_is_same(&options_format, new_val, old_options,
|
||||
options_format.vars[i].name)) {
|
||||
line = get_assigned_option(&options_format, new_val,
|
||||
options_format.vars[i].name, 1);
|
||||
const config_var_t *var = &options_format.vars[i];
|
||||
const char *var_name = var->name;
|
||||
if (var->type == CONFIG_TYPE_LINELIST_S ||
|
||||
var->type == CONFIG_TYPE_OBSOLETE) {
|
||||
continue;
|
||||
}
|
||||
if (!option_is_same(&options_format, new_val, old_options, var_name)) {
|
||||
line = get_assigned_option(&options_format, new_val, var_name, 1);
|
||||
|
||||
if (line) {
|
||||
for (; line; line = line->next) {
|
||||
|
||||
Reference in New Issue
Block a user