Changeset f4a5940 for conf.c


Ignore:
Timestamp:
2006-01-15T20:31:59Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
daa9e02
Parents:
6fda350
Message:

Added REHASH command, IPC emulation in daemon (non-forked) mode.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • conf.c

    r6fda350 rf4a5940  
    6464        conf->ping_interval = 180;
    6565        conf->ping_timeout = 300;
     66        proxytype = 0;
    6667       
    6768        i = conf_loadini( conf, CONF_FILE );
     
    7677        }
    7778       
    78         while( ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
     79        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
     80        /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
    7981        {
    8082                if( opt == 'i' )
     
    108110                                CONF_FILE = g_strdup( optarg );
    109111                                g_free( conf );
    110                                 /* Re-evaluate arguments. */
     112                                /* Re-evaluate arguments. Don't use this option twice,
     113                                   you'll end up in an infinite loop! Hope this trick
     114                                   works with all libcs BTW.. */
    111115                                optind = 1;
    112116                                return( conf_load( argc, argv ) );
Note: See TracChangeset for help on using the changeset viewer.