Changes in conf.c [2a6ca4f:f4a5940]

File:

• conf.c (modified) (4 diffs)

conf.c

@@ -64 +64 @@
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
+        proxytype = 0;
         
         i = conf_loadini( conf, CONF_FILE );
@@ -76 +77 @@
         }
         
-        while( ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
+        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. */
         {
                 if( opt == 'i' )
@@ -92 +94 @@
                 }
                 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;
+                        conf->runmode = RUNMODE_DAEMON;
                 else if( opt == 'F' )
-                        conf->runmode=RUNMODE_FORKDAEMON;
+                        conf->runmode = RUNMODE_FORKDAEMON;
                 else if( opt == 'c' )
                 {
@@ -108 +110 @@
                                 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 ) );
                         }