Changeset 2231302 for conf.c

Timestamp:

2007-11-05T22:59:49Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

be68d99

Parents:

5e2615a (diff), 7435ccf (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:

Merging from Jelmer.

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -47 +47 @@
         conf = g_new0( conf_t, 1 );
         
-#ifdef IPV6
-        conf->iface = "::";
-#else
-        conf->iface = "0.0.0.0";
-#endif
-        conf->port = 6667;
+        conf->iface = NULL;
+        conf->port = "6667";
         conf->nofork = 0;
         conf->verbose = 0;
@@ -89 +85 @@
                 else if( opt == 'p' )
                 {
-                        if( ( sscanf( optarg, "%d", &i ) != 1 ) || ( i <= 0 ) || ( i > 65535 ) )
-                        {
-                                fprintf( stderr, "Invalid port number: %s\n", optarg );
-                                return( NULL );
-                        }
-                        conf->port = i;
+                        g_free( conf->port );
+                        conf->port = g_strdup( optarg );
                 }
                 else if( opt == 'P' )
@@ -204 +196 @@
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
                         {
-                                if( ( sscanf( ini->value, "%d", &i ) != 1 ) || ( i <= 0 ) || ( i > 65535 ) )
-                                {
-                                        fprintf( stderr, "Invalid port number: %s\n", ini->value );
-                                        return( 0 );
-                                }
-                                conf->port = i;
+                                conf->port = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "authmode" ) == 0 )