From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 18 Dec 2014 12:34:57 +0000 (-0500)
Subject: [master] Fix debug build broken by 38078
X-Git-Tag: v4_3_2.pre-beta~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=001b9d53258126b10d0d2e3776345095754aecd7;p=thirdparty%2Fdhcp.git

[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.
---

diff --git a/RELNOTES b/RELNOTES
index caeac9943..0f155986e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -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 edd09ea74..1d00507fd 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;