Merge branch 'ticket31240v2' into ticket31240v2_merged_2

diff --cc src/app/config/config.c
index 740315f3e419b3c472afe2a4afa829f0fcf2ce94,66047aeabc37ce8fc0a64540550392dfa78664e1..0cbc223d0252ce92d6e42ab5f60ed9fd7e0f1e03
--- 1/src/app/config/config.c
--- 2/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -8133,11 -8125,10 +8125,10 @@@ getinfo_helper_config(control_connectio
    (void) errmsg;
    if (!strcmp(question, "config/names")) {
      smartlist_t *sl = smartlist_new();
-     int i;
-     for (i = 0; option_vars_[i].member.name; ++i) {
-       const config_var_t *var = &option_vars_[i];
+     smartlist_t *vars = config_mgr_list_vars(get_options_mgr());
+     SMARTLIST_FOREACH_BEGIN(vars, const config_var_t *, var) {
 -      /* don't tell controller about triple-underscore options */
 -      if (var->flags & CVFLAG_INVISIBLE)
 +      /* don't tell controller about invisible options */
 +      if (config_var_is_invisible(var))
          continue;
        const char *type = struct_var_get_typename(&var->member);
        if (!type)

diff --cc src/app/config/confparse.c
index 6e2624466abc3f5a963b2d397e8801302973a10f,e0615ac13d89af4b060e8bc75dfc2d83dbb1ef69..f20a361ba39c0d292bcf239f3834d616d8b5333a
--- 1/src/app/config/confparse.c
--- 2/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@@ -651,13 -1073,13 +1083,13 @@@ config_dump(const config_mgr_t *mgr, co
        continue;
      }
      /* Don't save 'hidden' control variables. */
-     if (! config_var_is_dumpable(&fmt->vars[i]))
 -    if (mv->cvar->flags & CVFLAG_NODUMP)
++    if (! config_var_is_dumpable(mv->cvar))
        continue;
-     if (minimal && config_is_same(fmt, options, defaults,
-                                   fmt->vars[i].member.name))
+     const char *name = mv->cvar->member.name;
+     if (minimal && config_is_same(mgr, options, defaults, name))
        continue;
      else if (comment_defaults &&
-              config_is_same(fmt, options, defaults, fmt->vars[i].member.name))
+              config_is_same(mgr, options, defaults, name))
        comment_option = 1;
  
      line = assigned =

diff --cc src/app/config/confparse.h
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test.h
Simple merge

diff --cc src/test/test_hs_service.c
Simple merge

diff --cc src/test/test_options.c
Simple merge