Changeset 6738a67 for conf.c

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in latest trunk

File:

• conf.c (modified) (7 diffs)

conf.c

@@ -45 +45 @@
         conf = g_new0( conf_t, 1 );
         
-        conf->iface = NULL;
+        conf->iface_in = NULL;
+        conf->iface_out = NULL;
         conf->port = g_strdup( "6667" );
         conf->nofork = 0;
@@ -78 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
                 if( opt == 'i' )
                 {
-                        conf->iface = g_strdup( optarg );
+                        conf->iface_in = g_strdup( optarg );
                 }
                 else if( opt == 'p' )
@@ -132 +133 @@
                                 "\n"
                                 "  -I  Classic/InetD mode. (Default)\n"
-                                "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
+                                "  -D  Daemon mode. (one process serves all)\n"
                                 "  -F  Forking daemon. (one process per client)\n"
                                 "  -u  Run daemon as specified user.\n"
@@ -146 +147 @@
                         return NULL;
                 }
-                else if( opt == 'R' )
-                {
-                        /* We can't load the statefile yet (and should make very sure we do this
-                           only once), so set the filename here and load the state information
-                           when initializing ForkDaemon. (This option only makes sense in that
-                           mode anyway!) */
-                        ipc_master_set_statefile( optarg );
-                }
                 else if( opt == 'u' )
                 {
@@ -203 +196 @@
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
                         {
-                                g_free( conf->iface );
-                                conf->iface = g_strdup( ini->value );
+                                g_free( conf->iface_in );
+                                conf->iface_in = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
@@ -210 +203 @@
                                 g_free( conf->port );
                                 conf->port = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "clientinterface" ) == 0 )
+                        {
+                                g_free( conf->iface_out );
+                                conf->iface_out = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "authmode" ) == 0 )
@@ -258 +256 @@
                         {
                                 g_strfreev( conf->migrate_storage );
-                                conf->migrate_storage = g_strsplit( ini->value, " \t,;", -1 );
+                                conf->migrate_storage = g_strsplit_set( ini->value, " \t,;", -1 );
                         }
                         else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )