aboutsummaryrefslogtreecommitdiffstats
path: root/lib/isccfg
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2011-02-05 03:14:55 +0000
committerDoug Barton <dougb@FreeBSD.org>2011-02-05 03:14:55 +0000
commitfccc60c828fe78d2bd780145733aec0ab99dc91f (patch)
tree601b0776df11a070020ab894b76fd90e36393936 /lib/isccfg
parentf805c4c11684ad447d955512cb705ebc2aba9ef3 (diff)
downloadsrc-fccc60c828fe78d2bd780145733aec0ab99dc91f.tar.gz
src-fccc60c828fe78d2bd780145733aec0ab99dc91f.zip
Vendor import of BIND 9.6.3vendor/bind9/9.6.3
Notes
Notes: svn path=/vendor/bind9/dist/; revision=218308 svn path=/vendor/bind9/9.6.3/; revision=218309; tag=vendor/bind9/9.6.3
Diffstat (limited to 'lib/isccfg')
-rw-r--r--lib/isccfg/api2
-rw-r--r--lib/isccfg/namedconf.c22
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/isccfg/api b/lib/isccfg/api
index 2240cdda3ac8..fbbf923b5324 100644
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -1,3 +1,3 @@
LIBINTERFACE = 50
-LIBREVISION = 1
+LIBREVISION = 3
LIBAGE = 0
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 06104894642f..f291507a547d 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2002, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: namedconf.c,v 1.92 2008/09/27 23:35:31 jinmei Exp $ */
+/* $Id: namedconf.c,v 1.92.44.2 2010-05-13 23:47:49 tbox Exp $ */
/*! \file */
@@ -464,7 +464,7 @@ static cfg_type_t cfg_type_transferformat = {
static void
print_none(cfg_printer_t *pctx, const cfg_obj_t *obj) {
UNUSED(obj);
- cfg_print_chars(pctx, "none", 4);
+ cfg_print_cstr(pctx, "none");
}
static cfg_type_t cfg_type_none = {
@@ -492,7 +492,7 @@ parse_qstringornone(cfg_parser_t *pctx, const cfg_type_t *type,
static void
doc_qstringornone(cfg_printer_t *pctx, const cfg_type_t *type) {
UNUSED(type);
- cfg_print_chars(pctx, "( <quoted_string> | none )", 26);
+ cfg_print_cstr(pctx, "( <quoted_string> | none )");
}
static cfg_type_t cfg_type_qstringornone = {
@@ -505,7 +505,7 @@ static cfg_type_t cfg_type_qstringornone = {
static void
print_hostname(cfg_printer_t *pctx, const cfg_obj_t *obj) {
UNUSED(obj);
- cfg_print_chars(pctx, "hostname", 4);
+ cfg_print_cstr(pctx, "hostname");
}
static cfg_type_t cfg_type_hostname = {
@@ -538,7 +538,7 @@ parse_serverid(cfg_parser_t *pctx, const cfg_type_t *type,
static void
doc_serverid(cfg_printer_t *pctx, const cfg_type_t *type) {
UNUSED(type);
- cfg_print_chars(pctx, "( <quoted_string> | none | hostname )", 26);
+ cfg_print_cstr(pctx, "( <quoted_string> | none | hostname )");
}
static cfg_type_t cfg_type_serverid = {
@@ -887,7 +887,7 @@ parse_optional_uint32(cfg_parser_t *pctx, const cfg_type_t *type,
static void
doc_optional_uint32(cfg_printer_t *pctx, const cfg_type_t *type) {
UNUSED(type);
- cfg_print_chars(pctx, "[ <integer> ]", 13);
+ cfg_print_cstr(pctx, "[ <integer> ]");
}
static cfg_type_t cfg_type_optional_uint32 = {
@@ -1626,9 +1626,9 @@ static void
print_querysource(cfg_printer_t *pctx, const cfg_obj_t *obj) {
isc_netaddr_t na;
isc_netaddr_fromsockaddr(&na, &obj->value.sockaddr);
- cfg_print_chars(pctx, "address ", 8);
+ cfg_print_cstr(pctx, "address ");
cfg_print_rawaddr(pctx, &na);
- cfg_print_chars(pctx, " port ", 6);
+ cfg_print_cstr(pctx, " port ");
cfg_print_rawuint(pctx, isc_sockaddr_getport(&obj->value.sockaddr));
}
@@ -1926,11 +1926,11 @@ static void
print_logfile(cfg_printer_t *pctx, const cfg_obj_t *obj) {
cfg_print_obj(pctx, obj->value.tuple[0]); /* file */
if (obj->value.tuple[1]->type->print != cfg_print_void) {
- cfg_print_chars(pctx, " versions ", 10);
+ cfg_print_cstr(pctx, " versions ");
cfg_print_obj(pctx, obj->value.tuple[1]);
}
if (obj->value.tuple[2]->type->print != cfg_print_void) {
- cfg_print_chars(pctx, " size ", 6);
+ cfg_print_cstr(pctx, " size ");
cfg_print_obj(pctx, obj->value.tuple[2]);
}
}