Changes in conf.c [f4a5940:4bfca70]

File:

• conf.c (modified) (9 diffs)

conf.c

@@ -46 +46 @@
         conf = g_new0( conf_t, 1 );
         
-#ifdef IPV6
-        conf->iface = "::";
-#else
         conf->iface = "0.0.0.0";
-#endif
         conf->port = 6667;
         conf->nofork = 0;
@@ -57 +53 @@
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
-        conf->auth_pass = NULL;
-        conf->oper_pass = NULL;
+        conf->password = NULL;
         conf->configdir = g_strdup( CONFIG );
         conf->plugindir = g_strdup( PLUGINDIR );
@@ -64 +59 @@
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
-        proxytype = 0;
         
         i = conf_loadini( conf, CONF_FILE );
@@ -77 +71 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
-        /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
+        while( ( opt = getopt( argc, argv, "i:p:nvIDc:d:h" ) ) >= 0 )
         {
                 if( opt == 'i' )
@@ -94 +87 @@
                 }
                 else if( opt == 'n' )
-                        conf->nofork = 1;
+                        conf->nofork=1;
                 else if( opt == 'v' )
-                        conf->verbose = 1;
+                        conf->verbose=1;
                 else if( opt == 'I' )
-                        conf->runmode = RUNMODE_INETD;
+                        conf->runmode=RUNMODE_INETD;
                 else if( opt == 'D' )
-                        conf->runmode = RUNMODE_DAEMON;
-                else if( opt == 'F' )
-                        conf->runmode = RUNMODE_FORKDAEMON;
+                        conf->runmode=RUNMODE_DAEMON;
                 else if( opt == 'c' )
                 {
@@ -110 +101 @@
                                 CONF_FILE = g_strdup( optarg );
                                 g_free( conf );
-                                /* Re-evaluate arguments. Don't use this option twice, 
-                                   you'll end up in an infinite loop! Hope this trick
-                                   works with all libcs BTW.. */
-                                optind = 1;
                                 return( conf_load( argc, argv ) );
                         }
@@ -131 +118 @@
                                 "  -I  Classic/InetD mode. (Default)\n"
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
-                                "  -F  Forking daemon. (one process per client)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
                                 "      (Default: 0.0.0.0 (any interface))\n"
@@ -171 +157 @@
                                 if( g_strcasecmp( ini->value, "daemon" ) == 0 )
                                         conf->runmode = RUNMODE_DAEMON;
-                                else if( g_strcasecmp( ini->value, "forkdaemon" ) == 0 )
-                                        conf->runmode = RUNMODE_FORKDAEMON;
                                 else
                                         conf->runmode = RUNMODE_INETD;
@@ -200 +184 @@
                         else if( g_strcasecmp( ini->key, "authpassword" ) == 0 )
                         {
-                                conf->auth_pass = g_strdup( ini->value );
-                        }
-                        else if( g_strcasecmp( ini->key, "operpassword" ) == 0 )
-                        {
-                                conf->oper_pass = g_strdup( ini->value );
+                                conf->password = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "hostname" ) == 0 )