Changeset c4a1036 for conf.c

Timestamp:

2008-06-09T01:52:28Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

12ebe74

Parents:

e46e077 (diff), 783e9b7 (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 integration branch.

File:

• conf.c (modified) (4 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;
@@ -82 +83 @@
                 if( opt == 'i' )
                 {
-                        conf->iface = g_strdup( optarg );
+                        conf->iface_in = g_strdup( optarg );
                 }
                 else if( opt == 'p' )
@@ -202 +203 @@
                         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 )
@@ -209 +210 @@
                                 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 )