|
@@ -652,9 +652,14 @@ config_assign_line(const config_mgr_t *mgr, void *options,
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|
|
} else if (c->command == CONFIG_LINE_CLEAR && !clear_first) {
|
|
} else if (c->command == CONFIG_LINE_CLEAR && !clear_first) {
|
|
-
|
|
+
|
|
-
|
|
+
|
|
- config_reset(mgr, options, mvar, use_defaults);
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ tor_assert_nonfatal_unreached();
|
|
|
|
+ config_reset(mgr, options, mvar, use_defaults);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if (options_seen && ! config_var_is_cumulative(cvar)) {
|
|
if (options_seen && ! config_var_is_cumulative(cvar)) {
|