mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Something that I thought was a win turned out to be a lose. I now no longer

Browse Source 
even try to restore previous state when someone issues two conflicting
type options.
This commit is contained in:
Ben Cottrell
2001-02-14 01:46:03 +00:00
parent ff6e7b684a
commit 2caff6b7df
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bin/dig/dig.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dig.c,v 1.136 2001/02/13 23:12:13 tamino Exp $ */ /* $Id: dig.c,v 1.137 2001/02/14 01:46:03 tamino Exp $ */
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
@@ -421,6 +421,13 @@ buftoosmall:
result = dns_message_pseudosectiontotext(msg, result = dns_message_pseudosectiontotext(msg,
DNS_PSEUDOSECTION_OPT, DNS_PSEUDOSECTION_OPT,
flags, buf); flags, buf);
if (result == ISC_R_NOSPACE) {
len += OUTPUTBUF;
isc_buffer_free(&buf);
result = isc_buffer_allocate(mctx, &buf, len);
if (result == ISC_R_SUCCESS)
goto buftoosmall;
}
check_result(result, check_result(result,
"dns_message_pseudosectiontotext"); "dns_message_pseudosectiontotext");
} }
@@ -1016,10 +1023,6 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
(*lookup)->section_question = plusquest; (*lookup)->section_question = plusquest;
(*lookup)->comments = pluscomm; (*lookup)->comments = pluscomm;
} }
else {
(*lookup)->section_question = ISC_TRUE;
(*lookup)->comments = ISC_TRUE;
}
(*lookup)->ixfr_serial = ISC_FALSE; (*lookup)->ixfr_serial = ISC_FALSE;
} }
} else } else
@@ -1261,10 +1264,6 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
plusquest; plusquest;
lookup->comments = pluscomm; lookup->comments = pluscomm;
} }
else {
lookup->section_question = ISC_TRUE;
lookup->comments = ISC_TRUE;
}
lookup->ixfr_serial = ISC_FALSE; lookup->ixfr_serial = ISC_FALSE;
} }
continue; continue;
@@ -1354,10 +1353,12 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
ISC_LIST_APPEND(lookup_list, lookup, link); ISC_LIST_APPEND(lookup_list, lookup, link);
} }
/* If we haven't already printed a greeting, and we have a lookup /*
* If we haven't already printed a greeting, and we have a lookup
* with which to print one, do it now. The reason that we sometimes * with which to print one, do it now. The reason that we sometimes
* call it earlier than this is that we munge some of the things * call it earlier than this is that we munge some of the things
* printgreeting() needs under certain circumstances. */ * printgreeting() needs under certain circumstances.
*/
if (lookup && firstarg) if (lookup && firstarg)
{ {
printgreeting(argc, argv, lookup); printgreeting(argc, argv, lookup);