2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00

make +trace and +nssearch work together

This commit is contained in:
Brian Wellington
2001-07-29 23:23:42 +00:00
parent 9729bb1e46
commit ecc38edf79
2 changed files with 32 additions and 41 deletions

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.155 2001/07/28 01:41:28 bwelling Exp $ */
/* $Id: dig.c,v 1.156 2001/07/29 23:23:41 bwelling Exp $ */
#include <config.h>
#include <stdlib.h>
@@ -748,12 +748,6 @@ plus_option(char *option, isc_boolean_t is_batchfile,
ndots = 0;
break;
case 's': /* nssearch */
if (lookup->trace && state) {
fprintf(stderr,
"+trace and +nssearch cannot both be "
"specified. Ignoring +nssearch\n");
return;
}
lookup->ns_search_only = state;
if (state) {
lookup->trace_root = ISC_TRUE;
@@ -831,13 +825,6 @@ plus_option(char *option, isc_boolean_t is_batchfile,
case 'r':
switch (cmd[2]) {
case 'a': /* trace */
if (lookup->ns_search_only && state) {
fprintf(stderr,
"+trace and +nssearch cannot "
"both be specified. Ignoring "
"+trace\n");
return;
}
lookup->trace = state;
lookup->trace_root = state;
if (state) {