From 4da835dfa36189d330caccd953ea203ef20bb6f2 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Thu, 18 Dec 2014 07:43:01 -0500 Subject: [PATCH] [v4_1_esv] 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. --- RELNOTES | 1 + server/dhcpd.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index 1b8ccd251..a955ebaba 100644 --- a/RELNOTES +++ b/RELNOTES @@ -164,6 +164,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 ba8616a4c..968f50de5 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -229,9 +229,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; -- 2.47.3