Changeset 6aaa221 for conf.c


Ignore:
Timestamp:
2005-12-13T23:21:21Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
22bf64e
Parents:
ab4afba (diff), d3307e2 (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:

More work on the storage abstraction layer from Jelmer.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • conf.c

    rab4afba r6aaa221  
    5050        conf->nofork = 0;
    5151        conf->verbose = 0;
    52         conf->storage = "text";
     52        conf->primary_storage = "text";
    5353        conf->runmode = RUNMODE_INETD;
    5454        conf->authmode = AUTHMODE_OPEN;
     
    199199                                conf->motdfile = g_strdup( ini->value );
    200200                        }
    201                         else if( g_strcasecmp( ini->key, "storage" ) == 0 )
    202                         {
    203                                 g_free( conf->storage );
    204                                 conf->storage = g_strdup( ini->value );
     201                        else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )
     202                        {
     203                                g_free( conf->primary_storage );
     204                                conf->primary_storage = g_strdup( ini->value );
     205                        }
     206                        else if( g_strcasecmp( ini->key, "account_storage_migrate" ) == 0 )
     207                        {
     208                                g_strfreev( conf->migrate_storage );
     209                                conf->migrate_storage = g_strsplit( ini->value, " \t,;", -1 );
    205210                        }
    206211                        else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )
Note: See TracChangeset for help on using the changeset viewer.