Merge my storage fixes

1 files changed, 9 insertions, 4 deletions

diff --git a/conf.c b/conf.c
index 304a15a8..10c6911f 100644
--- a/conf.c
+++ b/conf.c
@@ -49,7 +49,7 @@ conf_t *conf_load( int argc, char *argv[] )
 	conf->port = 6667;
 	conf->nofork = 0;
 	conf->verbose = 0;
-	conf->storage = "text";
+	conf->primary_storage = "text";
 	conf->runmode = RUNMODE_INETD;
 	conf->authmode = AUTHMODE_OPEN;
 	conf->password = NULL;
@@ -198,10 +198,15 @@ static int conf_loadini( conf_t *conf, char *file )
 				g_free( conf->motdfile );
 				conf->motdfile = g_strdup( ini->value );
 			}
-			else if( g_strcasecmp( ini->key, "storage" ) == 0 )
+			else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )
 			{
-				g_free( conf->storage );
-				conf->storage = g_strdup( ini->value );
+				g_free( conf->primary_storage );
+				conf->primary_storage = g_strdup( ini->value );
+			}
+			else if( g_strcasecmp( ini->key, "account_storage_migrate" ) == 0 )
+			{
+				g_strfreev( conf->migrate_storage );
+				conf->migrate_storage = g_strsplit( ini->value, " \t,;", -1 );
 			}
 			else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )
 			{