Changeset 8a220893


Ignore:
Timestamp:
2019-10-20T11:56:36Z (3 weeks ago)
Author:
dequis <dx@…>
Branches:
master
Children:
3b76db7
Parents:
f89cdbd (diff), 10b3683 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop'

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • conf.c

    rf89cdbd r8a220893  
    277277                                g_free(conf->motdfile);
    278278                                conf->motdfile = g_strdup(ini->value);
    279                         } else if (g_strcasecmp(ini->key, "account_storage") == 0) {
     279                        } else if (g_strcasecmp(ini->key, "accountstorage") == 0 ||
     280                                   g_strcasecmp(ini->key, "account_storage") == 0) {
    280281                                g_free(conf->primary_storage);
    281282                                conf->primary_storage = g_strdup(ini->value);
    282                         } else if (g_strcasecmp(ini->key, "account_storage_migrate") == 0) {
     283                        } else if (g_strcasecmp(ini->key, "accountstoragemigrate") == 0 ||
     284                                   g_strcasecmp(ini->key, "account_storage_migrate") == 0) {
    283285                                g_strfreev(conf->migrate_storage);
    284286                                conf->migrate_storage = g_strsplit_set(ini->value, " \t,;", -1);
  • unix.c

    rf89cdbd r8a220893  
    8080
    8181        log_init();
     82        /* Catch early errors */
     83        log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
     84        log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
    8285
    8386        global.conf_file = g_strdup(CONF_FILE_DEF);
Note: See TracChangeset for help on using the changeset viewer.