4313. [bug] Handle ns_client_replace failures in test mode.

[RT #41190]

4313. [bug] Handle ns_client_replace failures in test mode.
[RT #41190]
d88ba937 · Mark Andrews · d83a9a98 · d88ba937 · d88ba937
Commit d88ba937 authored Feb 03, 2016 by Mark Andrews
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

CHANGES CHANGES +3 -0

bin/named/query.c bin/named/query.c +10 -2

No files found.
--- a/CHANGES
+++ b/CHANGES
+4313.	[bug]		Handle ns_client_replace failures in test mode.
+			[RT #41190]
+
 4312.	[bug]		dig's unknown dns and edns flags (MBZ value) logging
 			was not consistent. [RT #41600]


--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -8902,8 +8902,16 @@ ns_query_start(ns_client_t *client) {
 	/*
 	 * Test only.
 	 */
-	if (ns_g_clienttest && !TCP(client))
-		RUNTIME_CHECK(ns_client_replace(client) == ISC_R_SUCCESS);
+	if (ns_g_clienttest && !TCP(client)) {
+		result = ns_client_replace(client);
+		if (result == ISC_R_SHUTTINGDOWN) {
+			ns_client_next(client, result);
+			return;
+		} else if (result != ISC_R_SUCCESS) {
+			query_error(client, result, __LINE__);
+			return;
+		}
+	}

 	/*
 	 * Ensure that appropriate cleanups occur.