|
Lines 219-225
Link Here
|
| 219 |
|
219 |
|
| 220 |
static void usage PROTO ((void)); |
220 |
static void usage PROTO ((void)); |
| 221 |
|
221 |
|
| 222 |
@@ -195,6 +201,32 @@ |
222 |
@@ -193,6 +199,32 @@ |
| 223 |
omapi_object_dereference (&listener, MDL); |
223 |
omapi_object_dereference (&listener, MDL); |
| 224 |
} |
224 |
} |
| 225 |
|
225 |
|
|
Lines 252-258
Link Here
|
| 252 |
int main (argc, argv, envp) |
252 |
int main (argc, argv, envp) |
| 253 |
int argc; |
253 |
int argc; |
| 254 |
char **argv, **envp; |
254 |
char **argv, **envp; |
| 255 |
@@ -228,6 +260,9 @@ |
255 |
@@ -226,6 +258,9 @@ |
| 256 |
char *traceoutfile = (char *)0; |
256 |
char *traceoutfile = (char *)0; |
| 257 |
#endif |
257 |
#endif |
| 258 |
|
258 |
|
|
Lines 262-268
Link Here
|
| 262 |
/* Make sure we have stdin, stdout and stderr. */ |
262 |
/* Make sure we have stdin, stdout and stderr. */ |
| 263 |
status = open ("/dev/null", O_RDWR); |
263 |
status = open ("/dev/null", O_RDWR); |
| 264 |
if (status == 0) |
264 |
if (status == 0) |
| 265 |
@@ -254,6 +289,7 @@ |
265 |
@@ -252,6 +287,7 @@ |
| 266 |
dhcp_common_objects_setup (); |
266 |
dhcp_common_objects_setup (); |
| 267 |
|
267 |
|
| 268 |
/* Initially, log errors to stderr as well as to syslogd. */ |
268 |
/* Initially, log errors to stderr as well as to syslogd. */ |
|
Lines 270-276
Link Here
|
| 270 |
#ifdef SYSLOG_4_2 |
270 |
#ifdef SYSLOG_4_2 |
| 271 |
openlog ("dhcpd", LOG_NDELAY); |
271 |
openlog ("dhcpd", LOG_NDELAY); |
| 272 |
log_priority = DHCPD_LOG_FACILITY; |
272 |
log_priority = DHCPD_LOG_FACILITY; |
| 273 |
@@ -322,6 +358,14 @@ |
273 |
@@ -320,6 +356,14 @@ |
| 274 |
} else if (!strcmp (argv [i], "-q")) { |
274 |
} else if (!strcmp (argv [i], "-q")) { |
| 275 |
quiet = 1; |
275 |
quiet = 1; |
| 276 |
quiet_interface_discovery = 1; |
276 |
quiet_interface_discovery = 1; |
|
Lines 285-291
Link Here
|
| 285 |
} else if (!strcmp (argv [i], "--version")) { |
285 |
} else if (!strcmp (argv [i], "--version")) { |
| 286 |
log_info ("isc-dhcpd-%s", DHCP_VERSION); |
286 |
log_info ("isc-dhcpd-%s", DHCP_VERSION); |
| 287 |
exit (0); |
287 |
exit (0); |
| 288 |
@@ -497,12 +541,6 @@ |
288 |
@@ -495,12 +539,6 @@ |
| 289 |
|
289 |
|
| 290 |
group_write_hook = group_writer; |
290 |
group_write_hook = group_writer; |
| 291 |
|
291 |
|
|
Lines 298-304
Link Here
|
| 298 |
/* Discover all the network interfaces and initialize them. */ |
298 |
/* Discover all the network interfaces and initialize them. */ |
| 299 |
discover_interfaces (DISCOVER_SERVER); |
299 |
discover_interfaces (DISCOVER_SERVER); |
| 300 |
|
300 |
|
| 301 |
@@ -556,6 +594,11 @@ |
301 |
@@ -521,7 +559,6 @@ |
|
|
302 |
#if defined (TRACING) |
| 303 |
trace_seed_stash (trace_srandom, seed + cur_time); |
| 304 |
#endif |
| 305 |
- postdb_startup (); |
| 306 |
|
| 307 |
#ifndef DEBUG |
| 308 |
if (daemon) { |
| 309 |
@@ -554,6 +591,11 @@ |
| 302 |
log_fatal ("There's already a DHCP server running."); |
310 |
log_fatal ("There's already a DHCP server running."); |
| 303 |
} |
311 |
} |
| 304 |
|
312 |
|
|
Lines 310-316
Link Here
|
| 310 |
/* If we were requested to log to stdout on the command line, |
318 |
/* If we were requested to log to stdout on the command line, |
| 311 |
keep doing so; otherwise, stop. */ |
319 |
keep doing so; otherwise, stop. */ |
| 312 |
if (log_perror == -1) |
320 |
if (log_perror == -1) |
| 313 |
@@ -584,7 +627,16 @@ |
321 |
@@ -582,7 +624,17 @@ |
| 314 |
close (i); |
322 |
close (i); |
| 315 |
pidfilewritten = 1; |
323 |
pidfilewritten = 1; |
| 316 |
} |
324 |
} |
|
Lines 323-333
Link Here
|
| 323 |
+ |
331 |
+ |
| 324 |
+ if (lftest) |
332 |
+ if (lftest) |
| 325 |
+ exit (0); |
333 |
+ exit (0); |
|
|
334 |
+ postdb_startup (); |
| 326 |
+ |
335 |
+ |
| 327 |
#endif /* !DEBUG */ |
336 |
#endif /* !DEBUG */ |
| 328 |
|
337 |
|
| 329 |
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ |
338 |
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ |
| 330 |
@@ -877,8 +929,9 @@ |
339 |
@@ -875,8 +927,9 @@ |
| 331 |
log_info (copyright); |
340 |
log_info (copyright); |
| 332 |
log_info (arr); |
341 |
log_info (arr); |
| 333 |
|
342 |
|
