Changeset bd69a21 for unix.c


Ignore:
Timestamp:
2005-12-15T12:24:25Z (14 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
4146a07
Parents:
2983f5e (diff), bf02a67 (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 Wilmer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • unix.c

    r2983f5e rbd69a21  
    5353       
    5454        global.helpfile = g_strdup( HELP_FILE );
    55        
     55
    5656        global.conf = conf_load( argc, argv );
    5757        if( global.conf == NULL )
    5858                return( 1 );
    59        
     59
     60
    6061        if( global.conf->runmode == RUNMODE_INETD )
    6162        {
     
    7778        if( i != 0 )
    7879                return( i );
     80
     81        global.storage = storage_init( global.conf->primary_storage,
     82                                                                   global.conf->migrate_storage );
     83        if ( global.storage == NULL) {
     84                log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
     85                return( 1 );
     86        }
     87       
    7988       
    8089        /* Catch some signals to tell the user what's happening before quitting */
     
    94103        if( !getuid() || !geteuid() )
    95104                log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
    96         if( access( global.conf->configdir, F_OK ) != 0 )
    97                 log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", CONFIG );
    98         else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
    99                 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );
    100105        if( help_init( &(global.help) ) == NULL )
    101106                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
Note: See TracChangeset for help on using the changeset viewer.