Changes in conf.c [aaf92a9:2c2df7d]

File:

• conf.c (modified) (7 diffs)

conf.c

@@ -63 +63 @@
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
-        conf->user = NULL;
+        conf->max_filetransfer_size = G_MAXUINT;
         proxytype = 0;
         
@@ -77 +77 @@
         }
         
-        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:hR:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -133 +133 @@
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
                                 "  -F  Forking daemon. (one process per client)\n"
-                                "  -u  Run daemon as specified user.\n"
                                 "  -P  Specify PID-file (not for inetd mode)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
@@ -153 +152 @@
                         ipc_master_set_statefile( optarg );
                 }
-                else if( opt == 'u' )
-                {
-                        g_free( conf->user );
-                        conf->user = g_strdup( optarg );
-                }
         }
         
@@ -199 +193 @@
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
                         {
-                                g_free( conf->iface );
                                 conf->iface = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
                         {
-                                g_free( conf->port );
                                 conf->port = g_strdup( ini->value );
                         }
@@ -218 +210 @@
                         else if( g_strcasecmp( ini->key, "authpassword" ) == 0 )
                         {
-                                g_free( conf->auth_pass );
                                 conf->auth_pass = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "operpassword" ) == 0 )
                         {
-                                g_free( conf->oper_pass );
                                 conf->oper_pass = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "hostname" ) == 0 )
                         {
-                                g_free( conf->hostname );
                                 conf->hostname = g_strdup( ini->value );
                         }
@@ -293 +282 @@
                                 g_free( url );
                         }
-                        else if( g_strcasecmp( ini->key, "user" ) == 0 )
-                        {
-                                g_free( conf->user );
-                                conf->user = g_strdup( ini->value );
-                        }
                         else
                         {