Changeset 8a220893

Timestamp:

2019-10-20T11:56:36Z (5 years 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:

• conf.c (modified) (1 diff)
• unix.c (modified) (1 diff)

conf.c

@@ -277 +277 @@
                                 g_free(conf->motdfile);
                                 conf->motdfile = g_strdup(ini->value);
-                        } else if (g_strcasecmp(ini->key, "account_storage") == 0) {
+                        } else if (g_strcasecmp(ini->key, "accountstorage") == 0 ||
+                                   g_strcasecmp(ini->key, "account_storage") == 0) {
                                 g_free(conf->primary_storage);
                                 conf->primary_storage = g_strdup(ini->value);
-                        } else if (g_strcasecmp(ini->key, "account_storage_migrate") == 0) {
+                        } else if (g_strcasecmp(ini->key, "accountstoragemigrate") == 0 ||
+                                   g_strcasecmp(ini->key, "account_storage_migrate") == 0) {
                                 g_strfreev(conf->migrate_storage);
                                 conf->migrate_storage = g_strsplit_set(ini->value, " \t,;", -1);

unix.c

@@ -80 +80 @@
 
         log_init();
+        /* Catch early errors */
+        log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
+        log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
 
         global.conf_file = g_strdup(CONF_FILE_DEF);