ntp_io.c:

  [Bug 795] Moved declaration of variable to top of function.
ChangeLog:
  [Bug 795] Moved declaration of variable to top of function.

bk: 4657e90339frZDP69qx-lCIY-Z_tEg

diff --git a/ChangeLog b/ChangeLog
index 1ff648547c6521ad297e64fc8251b62ba9ddfaf1..f5b3b156355656b010851f3ae5c3bd550144d854 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 795] Moved declaration of variable to top of function.
 * [Bug 789] Fix multicast client crypto authentication and make sure arriving
            multicast packets do not disturb the autokey dance.
 * [Bug 785] improve handling of multicast interfaces

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index d7e52a70a44c43b1e1c31d4a3d0e856b5d553c94..33b757d82f1ad5563fa8bb699cdaa4ae4692f04c 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3254,6 +3254,9 @@ findlocalcastinterface(
 {
        struct interface *interface;
        struct interface *nif = NULL;
+#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
+       isc_boolean_t want_linklocal;
+#endif 
 
        /*
         * see how kernel maps the mcast address
@@ -3266,7 +3269,7 @@ findlocalcastinterface(
        }
 
 #ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
-       isc_boolean_t want_linklocal = ISC_FALSE; 
+       want_linklocal = ISC_FALSE; 
        if (addr_ismulticast(addr) && flags == INT_MULTICAST)
        {
                if (IN6_IS_ADDR_MC_LINKLOCAL(&((struct sockaddr_in6*)addr)->sin6_addr))