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

diff --git a/RELNOTES b/RELNOTES
index 1b8ccd251c45ab38904f454f05bc35580ce71bed..a955ebaba6d8519b904fbe832014117ebd3c5650 100644 (file)
--- 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 ba8616a4ccf555e742981b0a1a81adbc8908a40b..968f50de519b7b8242f6a0dc06161b81095f0179 100644 (file)
--- 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;