Changeset d3307e2 for conf.c

Timestamp:

2005-12-13T23:07:05Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

6aaa221

Parents:

34759e6 (diff), b73ac9c (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 my storage fixes

File:

• conf.c (modified) (2 diffs)

conf.c

@@ -50 +50 @@
         conf->nofork = 0;
         conf->verbose = 0;
-        conf->storage = "text";
+        conf->primary_storage = "text";
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
@@ -199 +199 @@
                                 conf->motdfile = g_strdup( ini->value );
                         }
-                        else if( g_strcasecmp( ini->key, "storage" ) == 0 )
-                        {
-                                g_free( conf->storage );
-                                conf->storage = g_strdup( ini->value );
+                        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, "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 )