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

If a zone is specified by the user, use it as the suffix for relative names.

Browse Source
This commit is contained in:
Brian Wellington
2000-07-06 19:29:40 +00:00
parent c1db6a381f
commit b67a6d9657
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/nsupdate/nsupdate.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: nsupdate.c,v 1.25 2000/07/05 23:42:08 bwelling Exp $ */ /* $Id: nsupdate.c,v 1.26 2000/07/06 19:29:40 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -528,7 +528,7 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) {
isc_buffer_t source; isc_buffer_t source;
unsigned int dots; unsigned int dots;
isc_boolean_t last; isc_boolean_t last;
dns_name_t *rn = origin; dns_name_t *rn;
word = nsu_strsep(cmdlinep, " \t\r\n"); word = nsu_strsep(cmdlinep, " \t\r\n");
if (*word == 0) { if (*word == 0) {
@@ -548,6 +548,10 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) {
dots = count_dots(word, &last); dots = count_dots(word, &last);
if (dots > lwconf->ndots || last) if (dots > lwconf->ndots || last)
rn = dns_rootname; rn = dns_rootname;
else if (userzone != NULL)
rn = userzone;
else
rn = origin;
result = dns_name_fromtext(*namep, &source, rn, result = dns_name_fromtext(*namep, &source, rn,
ISC_FALSE, NULL); ISC_FALSE, NULL);
check_result(result, "dns_name_fromtext"); check_result(result, "dns_name_fromtext");
@@ -564,6 +568,7 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass,
isc_lex_t *lex = NULL; isc_lex_t *lex = NULL;
dns_rdatacallbacks_t callbacks; dns_rdatacallbacks_t callbacks;
isc_result_t result; isc_result_t result;
dns_name_t *rn;
while (*cmdline != 0 && isspace((unsigned char)*cmdline)) while (*cmdline != 0 && isspace((unsigned char)*cmdline))
cmdline++; cmdline++;
@@ -580,8 +585,12 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass,
result = isc_buffer_allocate(mctx, &buf, MXNAME); result = isc_buffer_allocate(mctx, &buf, MXNAME);
check_result(result, "isc_buffer_allocate"); check_result(result, "isc_buffer_allocate");
dns_rdatacallbacks_init_stdio(&callbacks); dns_rdatacallbacks_init_stdio(&callbacks);
if (userzone != NULL)
rn = userzone;
else
rn = origin;
result = dns_rdata_fromtext(*rdatap, rdataclass, rdatatype, lex, result = dns_rdata_fromtext(*rdatap, rdataclass, rdatatype, lex,
origin, ISC_FALSE, rn, ISC_FALSE,
buf, &callbacks); buf, &callbacks);
dns_message_takebuffer(msg, &buf); dns_message_takebuffer(msg, &buf);
isc_lex_destroy(&lex); isc_lex_destroy(&lex);