upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 07:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[master] setup tsig in dig/host/nslookup

Browse source 
(Change #3813 had broken some system tests.)
This commit is contained in:
Evan Hunt 2014-04-18 07:27:50 -07:00
parent ec3b216506
commit 58e291cb8d
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/dig/dig.c
View file

@ -1976,6 +1976,10 @@ main(int argc, char **argv) {
setup_libs();
setup_system();
parse_args(ISC_FALSE, ISC_FALSE, argc, argv);
if (keyfile[0] != 0)
setup_file_key();
else if (keysecret[0] != 0)
setup_text_key();
if (domainopt[0] != '\0') {
set_search_domain(domainopt);
usesearch = ISC_TRUE;

4
bin/dig/dighost.c
View file

@ -944,7 +944,7 @@ requeue_lookup(dig_lookup_t *lookold, isc_boolean_t servers) {
}
static void
void
setup_text_key(void) {
isc_result_t result;
dns_name_t keyname;
@ -1192,7 +1192,7 @@ read_confkey(void) {
return (result);
}
static void
void
setup_file_key(void) {
isc_result_t result;
dst_key_t *dstkey = NULL;

4
bin/dig/host.c
View file

@ -894,6 +894,10 @@ main(int argc, char **argv) {
setup_libs();
setup_system();
parse_args(ISC_FALSE, argc, argv);
if (keyfile[0] != 0)
setup_file_key();
else if (keysecret[0] != 0)
setup_text_key();
result = isc_app_onrun(mctx, global_task, onrun_callback, NULL);
check_result(result, "isc_app_onrun");
isc_app_run();

3
bin/dig/include/dig/dig.h
View file

@ -432,6 +432,9 @@ chase_sig(dns_message_t *msg);
void save_opt(dig_lookup_t *lookup, char *code, char *value);
void setup_file_key(void);
void setup_text_key(void);
ISC_LANG_ENDDECLS
#endif

4
bin/dig/nslookup.c
View file

@ -911,6 +911,10 @@ main(int argc, char **argv) {
setup_system();
parse_args(argc, argv);
if (keyfile[0] != 0)
setup_file_key();
else if (keysecret[0] != 0)
setup_text_key();
if (domainopt[0] != '\0')
set_search_domain(domainopt);
if (in_use)