- Timestamp:
- 2007-12-04T01:08:43Z (16 years ago)
- Branches:
- master
- Children:
- 793cc25
- Parents:
- fa30fa5 (diff), aaf92a9 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
conf.c
rfa30fa5 r08135df 63 63 conf->ping_interval = 180; 64 64 conf->ping_timeout = 300; 65 conf->user = NULL; 65 66 conf->max_filetransfer_size = G_MAXUINT; 66 67 proxytype = 0; … … 77 78 } 78 79 79 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR: " ) ) >= 0 )80 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 ) 80 81 /* ^^^^ Just to make sure we skip this step from the REHASH handler. */ 81 82 { … … 133 134 " -D Daemon mode. (Still EXPERIMENTAL!)\n" 134 135 " -F Forking daemon. (one process per client)\n" 136 " -u Run daemon as specified user.\n" 135 137 " -P Specify PID-file (not for inetd mode)\n" 136 138 " -i Specify the interface (by IP address) to listen on.\n" … … 152 154 ipc_master_set_statefile( optarg ); 153 155 } 156 else if( opt == 'u' ) 157 { 158 g_free( conf->user ); 159 conf->user = g_strdup( optarg ); 160 } 154 161 } 155 162 … … 193 200 else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 ) 194 201 { 202 g_free( conf->iface ); 195 203 conf->iface = g_strdup( ini->value ); 196 204 } 197 205 else if( g_strcasecmp( ini->key, "daemonport" ) == 0 ) 198 206 { 207 g_free( conf->port ); 199 208 conf->port = g_strdup( ini->value ); 200 209 } … … 210 219 else if( g_strcasecmp( ini->key, "authpassword" ) == 0 ) 211 220 { 221 g_free( conf->auth_pass ); 212 222 conf->auth_pass = g_strdup( ini->value ); 213 223 } 214 224 else if( g_strcasecmp( ini->key, "operpassword" ) == 0 ) 215 225 { 226 g_free( conf->oper_pass ); 216 227 conf->oper_pass = g_strdup( ini->value ); 217 228 } 218 229 else if( g_strcasecmp( ini->key, "hostname" ) == 0 ) 219 230 { 231 g_free( conf->hostname ); 220 232 conf->hostname = g_strdup( ini->value ); 221 233 } … … 282 294 g_free( url ); 283 295 } 296 else if( g_strcasecmp( ini->key, "user" ) == 0 ) 297 { 298 g_free( conf->user ); 299 conf->user = g_strdup( ini->value ); 300 } 284 301 else 285 302 {
Note: See TracChangeset
for help on using the changeset viewer.