From: Evan Hunt <each@isc.org>
Date: Wed, 15 Feb 2023 00:56:51 +0000 (-0800)
Subject: add explicit error for +trace argument
X-Git-Tag: v9.19.12~57^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e90bb121a7df2d52a99d147301e848bab462a9c1;p=thirdparty%2Fbind9.git

add explicit error for +trace argument

add a specific error message when someone tries to use
"delv +trace" suggesting "delv +ns" instead.
---

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 617bc0f1d46..485b193d117 100644
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -1275,8 +1275,19 @@ plus_option(char *option) {
 			use_tcp = state;
 			break;
 		case 'r':
-			FULLCHECK("trust");
-			showtrust = state;
+			switch (cmd[2]) {
+			case 'a': /* trace */
+				FULLCHECK("trace");
+				fatal("Invalid argument +trace. For "
+				      "delegation path tracing, use +ns.");
+				break;
+			case 'u': /* trust */
+				FULLCHECK("trust");
+				showtrust = state;
+				break;
+			default:
+				goto invalid_option;
+			}
 			break;
 		case 't': /* ttl */
 			FULLCHECK("ttl");