From 0a6e221ee8272f07eedf50b452048c2eccc8aa0f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 15 Jan 2019 08:45:26 -0800 Subject: [PATCH 1/2] python: dns_hub: Fix indentation of 'raise' on error. Remove second socket.sendto(). Bug: https://bugzilla.samba.org/show_bug.cgi?id=13750 Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider (cherry picked from commit dd231a16a338cfe63d12cadf0fc3e2ebe7cac828) --- python/samba/tests/dns_forwarder_helpers/dns_hub.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python/samba/tests/dns_forwarder_helpers/dns_hub.py b/python/samba/tests/dns_forwarder_helpers/dns_hub.py index 81aa478..cf9beb7 100755 --- a/python/samba/tests/dns_forwarder_helpers/dns_hub.py +++ b/python/samba/tests/dns_forwarder_helpers/dns_hub.py @@ -123,9 +123,7 @@ class DnsHandler(sserver.BaseRequestHandler): except socket.error as err: print("Error sending %s to address %s for name %s: %s\n" % (forwarder, self.client_address, name, err.errno)) - raise - - socket.sendto(send_packet, self.client_address) + raise class server_thread(threading.Thread): def __init__(self, server): -- 2.7.4 From c821f75d6fb84f1699827ca22795809b10a00202 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 22 Jan 2019 09:24:35 -0800 Subject: [PATCH 2/2] libcli: dns: Change internal DNS_REQUEST_TIMEOUT from 2 to 10 seconds. Should make us more robust when dealing with slow DNS servers. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13750 Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Jan 22 23:37:16 CET 2019 on sn-devel-144 (cherry picked from commit 36c42e6d629a0d4b0e5c60bdd68e08a8e60c477a) --- libcli/dns/dns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcli/dns/dns.c b/libcli/dns/dns.c index 1321b1d..718bf56 100644 --- a/libcli/dns/dns.c +++ b/libcli/dns/dns.c @@ -39,7 +39,7 @@ struct dns_udp_request_state { size_t reply_len; }; -#define DNS_REQUEST_TIMEOUT 2 +#define DNS_REQUEST_TIMEOUT 10 /* Declare callback functions used below. */ static void dns_udp_request_get_reply(struct tevent_req *subreq); -- 2.7.4