Changes in / [8a220893:f89cdbd]

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, "accountstorage") == 0 ||
-                                   g_strcasecmp(ini->key, "account_storage") == 0) {
+                        } else if (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, "accountstoragemigrate") == 0 ||
-                                   g_strcasecmp(ini->key, "account_storage_migrate") == 0) {
+                        } else if (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);