Changes in conf.c [823de9d:90cd6c4]

File:

• conf.c (modified) (7 diffs)

conf.c

@@ -60 +60 @@
         conf->pidfile = g_strdup( PIDFILE );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
-        conf->welcomefile = g_strdup( ETCDIR "/welcome.txt" );
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->protocols = NULL;
         proxytype = 0;
         
@@ -79 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -128 +128 @@
                 {
                         printf( "Usage: bitlbee [-D/-F [-i <interface>] [-p <port>] [-n] [-v]] [-I]\n"
-                                "               [-c <file>] [-d <dir>] [-h]\n"
+                                "               [-c <file>] [-d <dir>] [-x] [-h]\n"
                                 "\n"
                                 "An IRC-to-other-chat-networks gateway\n"
@@ -144 +144 @@
                                 "  -c  Load alternative configuration file\n"
                                 "  -d  Specify alternative user configuration directory\n"
+                                "  -x  Command-line interface to password encryption/hashing\n"
                                 "  -h  Show this help page.\n" );
                         return NULL;
@@ -249 +250 @@
                                 g_free( conf->motdfile );
                                 conf->motdfile = g_strdup( ini->value );
-                        }
-                        else if( g_strcasecmp( ini->key, "welcomefile" ) == 0 )
-                        {
-                                g_free( conf->welcomefile );
-                                conf->welcomefile = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )
@@ -312 +308 @@
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "protocols" ) == 0 )
+                        {
+                                g_strfreev( conf->protocols );
+                                conf->protocols = g_strsplit_set( ini->value, " \t,;", -1 );
+                        }
                         else
                         {
-                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
+                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file (line %d).\n", ini->key, ini->line );
                                 return 0;
                                 /* For now just ignore unknown keys... */
@@ -321 +322 @@
                 else if( g_strcasecmp( ini->section, "defaults" ) != 0 )
                 {
-                        fprintf( stderr, "Error: Unknown section [%s] in configuration file. "
-                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section );
+                        fprintf( stderr, "Error: Unknown section [%s] in configuration file (line %d). "
+                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section, ini->line );
                         return 0;
                 }