upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

use dns_name_format()

Browse source
This commit is contained in:
Andreas Gustafsson 2000-04-11 19:08:32 +00:00
parent 64305fb5cf
commit 5646eb8cd1
2 changed files with 10 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bin/named/xfrout.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: xfrout.c,v 1.55 2000/04/07 22:30:41 gson Exp $ */
/* $Id: xfrout.c,v 1.56 2000/04/11 19:08:32 gson Exp $ */
#include <config.h>
@ -1495,29 +1495,14 @@ static void
xfrout_logv(ns_client_t *client, dns_name_t *zonename, int level,
const char *fmt, va_list ap)
{
isc_buffer_t znbuf;
char znmem[1024];
isc_result_t result;
char msgmem[2048];
isc_boolean_t omit_final_dot = ISC_TRUE;
if (dns_name_equal(zonename, dns_rootname))
omit_final_dot = ISC_FALSE;
isc_buffer_init(&znbuf, znmem, sizeof(znmem), ISC_BUFFERTYPE_TEXT);
result = dns_name_totext(zonename, omit_final_dot, &znbuf);
if (result != ISC_R_SUCCESS) {
isc_buffer_clear(&znbuf);
isc_buffer_putmem(&znbuf, (unsigned char *)"<UNKNOWN>",
strlen("<UNKNOWN>"));
}
vsnprintf(msgmem, sizeof(msgmem), fmt, ap);
char msgbuf[2048];
char namebuf[1024];
dns_name_format(zonename, namebuf, sizeof(namebuf));
vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT,
NS_LOGMODULE_XFER_OUT, level,
"transfer of '%.*s': %s", znbuf.used, znbuf.base,
msgmem);
"transfer of '%s': %s", namebuf, msgbuf);
}
/* Logging function for use when a xfrout_ctx_t has not yet been created. */

19
lib/dns/xfrin.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: xfrin.c,v 1.62 2000/04/08 04:42:42 bwelling Exp $ */
/* $Id: xfrin.c,v 1.63 2000/04/11 19:08:11 gson Exp $ */
#include <config.h>
@ -1306,24 +1306,13 @@ static void
xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
const char *fmt, va_list ap)
{
isc_buffer_t znbuf;
char znmem[1024];
char znbuf[1024];
isc_buffer_t masterbuf;
char mastermem[256];
isc_result_t result;
char msgmem[2048];
isc_boolean_t omit_final_dot = ISC_TRUE;
if (dns_name_equal(zonename, dns_rootname))
omit_final_dot = ISC_FALSE;
isc_buffer_init(&znbuf, znmem, sizeof(znmem), ISC_BUFFERTYPE_TEXT);
result = dns_name_totext(zonename, omit_final_dot, &znbuf);
if (result != ISC_R_SUCCESS) {
isc_buffer_clear(&znbuf);
isc_buffer_putmem(&znbuf, (unsigned char *)"<UNKNOWN>",
strlen("<UNKNOWN>"));
}
dns_name_format(zonename, znbuf, sizeof(znbuf));
isc_buffer_init(&masterbuf, mastermem, sizeof(mastermem),
ISC_BUFFERTYPE_TEXT);
@ -1335,7 +1324,7 @@ xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
isc_log_write(dns_lctx, DNS_LOGCATEGORY_XFER_IN,
DNS_LOGMODULE_XFER_IN, level,
"transfer of '%.*s' from %s: %s", znbuf.used, znbuf.base,
"transfer of '%s' from %s: %s", znbuf,
masterbuf.base, msgmem);
}