2509. [bug] Specifying a fixed query source port was broken.

                        [RT #19051]

diff --git a/CHANGES b/CHANGES
index ed900cb3947eacfea14644504077a29edcc9e377..8ac35e94b92abd2ac6c5e779f33d793a5e2257bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2509.  [bug]           Specifying a fixed query source port was broken.
+                       [RT #19051]
+
 2504.  [bug]           Address race condition in the socket code. [RT #18899]
 
        --- 9.6.0rc1 released ---

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 4ab2f3eee02c366dfbce7d0d18482e17f8a13edd..d26d558b7bf5e8ef4954053d2d7a78cfacbdc91d 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.155 2008/11/12 23:10:57 marka Exp $ */
+/* $Id: dispatch.c,v 1.155.12.1 2008/12/10 21:59:41 marka Exp $ */
 
 /*! \file */
 
@@ -2702,6 +2702,15 @@ get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp,
                 * If this fails 1024 times, we then ask the kernel for
                 * choosing one.
                 */
+       } else {
+               /* Allow to reuse address for non-random ports. */
+               result = open_socket(sockmgr, localaddr,
+                                    ISC_SOCKET_REUSEADDRESS, &sock);
+ 
+               if (result == ISC_R_SUCCESS)
+                       *sockp = sock;
+ 
+               return (result);
        }
 
        memset(held, 0, sizeof(held));