diff options
author | Thomas Markwalder <tmark@isc.org> | 2014-12-18 07:34:57 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2014-12-18 07:34:57 -0500 |
commit | 001b9d53258126b10d0d2e3776345095754aecd7 (patch) | |
tree | 1db69c593ab51dfbc20658ffd1fa2c5de066eb9a | |
parent | cb8c997e487d3ceb8a1990a8acdc5ffd73155f1c (diff) | |
download | isc-dhcp-001b9d53258126b10d0d2e3776345095754aecd7.tar.gz |
[master] Fix debug build broken by 38078
server/dhcpd.c -
moved declarations of local variable in main(), used by pid file
logic, outside of debug conditional compilation.
-rw-r--r-- | RELNOTES | 1 | ||||
-rw-r--r-- | server/dhcpd.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -208,6 +208,7 @@ by Eric Young (eay@cryptsoft.com). instance. This check is only included if the admin hasn't disabled PID files. [ISC-Bugs #38078] + [ISC-Bugs #38143] - In the client code change the way preferred_life and max_life are printed for environment variables to be unsigned rather than signed. diff --git a/server/dhcpd.c b/server/dhcpd.c index edd09ea7..1d00507f 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -150,9 +150,9 @@ main(int argc, char **argv) { char *s; int cftest = 0; int lftest = 0; -#ifndef DEBUG int pid; char pbuf [20]; +#ifndef DEBUG int daemon = 1; #endif int quiet = 0; |