diff options
| -rw-r--r-- | conf.c | 3 | ||||
| -rw-r--r-- | storage_xml.c | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -41,7 +41,6 @@ static int conf_loadini( conf_t *conf, char *file ); conf_t *conf_load( int argc, char *argv[] ) { - char *mig_list[2] = { "text", NULL }; conf_t *conf; int opt, i; @@ -56,7 +55,7 @@ conf_t *conf_load( int argc, char *argv[] ) conf->nofork = 0; conf->verbose = 0; conf->primary_storage = "xml"; - conf->migrate_storage = mig_list; + conf->migrate_storage = g_strsplit( "text", ",", -1 ); conf->runmode = RUNMODE_INETD; conf->authmode = AUTHMODE_OPEN; conf->auth_pass = NULL; diff --git a/storage_xml.c b/storage_xml.c index 69e991d2..41a50d8c 100644 --- a/storage_xml.c +++ b/storage_xml.c @@ -287,16 +287,22 @@ static storage_status_t xml_load_real( const char *my_nick, const char *password /* Slightly dirty... */ if( gerr && strcmp( gerr->message, XML_PASS_ERRORMSG ) == 0 ) + { + g_clear_error( &gerr ); return STORAGE_INVALID_PASSWORD; + } else { if( gerr && irc ) irc_usermsg( irc, "Error from XML-parser: %s", gerr->message ); + g_clear_error( &gerr ); return STORAGE_OTHER_ERROR; } } } + /* Just to be sure... */ + g_clear_error( &gerr ); g_markup_parse_context_free( ctx ); close( fd ); |