summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/dns/include/dns/log.h4
-rw-r--r--lib/dns/journal.c4
-rw-r--r--lib/dns/log.c4
-rw-r--r--lib/dns/resolver.c4
-rw-r--r--lib/dns/tkey.c5
-rw-r--r--lib/dns/zone.c6
-rw-r--r--lib/isc/mem.c3
-rw-r--r--lib/isccfg/check.c10
-rw-r--r--lib/isccfg/include/isccfg/log.h6
-rw-r--r--lib/isccfg/log.c6
-rw-r--r--lib/isccfg/parser.c9
11 files changed, 32 insertions, 29 deletions
diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index 6a059865..b65259d1 100644
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: log.h,v 1.30 2001/08/27 03:36:00 marka Exp $ */
+/* $Id: log.h,v 1.30.2.1 2001/10/11 02:03:23 marka Exp $ */
/* Principal Authors: DCL */
@@ -32,7 +32,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
#define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0])
#define DNS_LOGCATEGORY_DATABASE (&dns_categories[1])
#define DNS_LOGCATEGORY_SECURITY (&dns_categories[2])
-#define DNS_LOGCATEGORY_CONFIG (&dns_categories[3])
+/* DNS_LOGCATEGORY_CONFIG superseded by CFG_LOGCATEGORY_CONFIG */
#define DNS_LOGCATEGORY_DNSSEC (&dns_categories[4])
#define DNS_LOGCATEGORY_RESOLVER (&dns_categories[5])
#define DNS_LOGCATEGORY_XFER_IN (&dns_categories[6])
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 54c4c448..e431f358 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: journal.c,v 1.77 2001/08/06 02:10:59 marka Exp $ */
+/* $Id: journal.c,v 1.77.2.1 2001/10/15 04:57:51 marka Exp $ */
#include <config.h>
@@ -490,7 +490,7 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
INSIST(sizeof(journal_rawheader_t) == JOURNAL_HEADER_SIZE);
- result = isc_stdio_open(filename, "w", &fp);
+ result = isc_stdio_open(filename, "wb", &fp);
if (result != ISC_R_SUCCESS) {
isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
"%s: create: %s",
diff --git a/lib/dns/log.c b/lib/dns/log.c
index 8b95316a..7f4fe1eb 100644
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: log.c,v 1.33 2001/08/27 03:35:58 marka Exp $ */
+/* $Id: log.c,v 1.33.2.2 2001/10/11 23:07:00 gson Exp $ */
/* Principal Authors: DCL */
@@ -33,7 +33,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = {
{ "notify", 0 },
{ "database", 0 },
{ "security", 0 },
- { "config", 0 },
+ { "oldconfig", 0 }, /* Placeholder */
{ "dnssec", 0 },
{ "resolver", 0 },
{ "xfer-in", 0 },
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 551bc838..35046624 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: resolver.c,v 1.218.2.3 2001/09/21 20:40:06 gson Exp $ */
+/* $Id: resolver.c,v 1.218.2.4 2001/10/12 17:49:41 gson Exp $ */
#include <config.h>
@@ -3609,7 +3609,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) {
if (ns_name != NULL)
ns_name->attributes &= ~DNS_NAMEATTR_CACHE;
- if (negative_response)
+ if (negative_response && oqname == NULL)
fctx->attributes |= FCTX_ATTR_WANTNCACHE;
return (ISC_R_SUCCESS);
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index a5b756d2..7e485489 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -16,7 +16,7 @@
*/
/*
- * $Id: tkey.c,v 1.71 2001/08/08 22:54:43 gson Exp $
+ * $Id: tkey.c,v 1.71.2.1 2001/10/09 23:06:57 gson Exp $
*/
#include <config.h>
@@ -643,7 +643,8 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx,
if (!dns_name_equal(qname, dns_rootname)) {
unsigned int n = dns_name_countlabels(qname);
- dns_name_getlabelsequence(qname, 0, n - 1, keyname);
+ dns_name_copy(qname, keyname, NULL);
+ dns_name_getlabelsequence(keyname, 0, n - 1, keyname);
}
else {
static char hexdigits[16] = {
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f126fe25..6f21c7c4 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: zone.c,v 1.333.2.2 2001/09/05 00:38:01 gson Exp $ */
+/* $Id: zone.c,v 1.333.2.3 2001/10/11 17:20:40 gson Exp $ */
#include <config.h>
@@ -2816,10 +2816,8 @@ save_nsrrset(dns_message_t *message, dns_name_t *name,
result = dns_rdata_tostruct(&rdata, &ns, NULL);
dns_rdata_reset(&rdata);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
- if (!dns_name_issubdomain(&ns.name, name)) {
- result = dns_rdataset_next(nsrdataset);
+ if (!dns_name_issubdomain(&ns.name, name))
continue;
- }
rdataset = NULL;
result = dns_message_findname(message, DNS_SECTION_ADDITIONAL,
&ns.name, dns_rdatatype_a6,
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 2930a085..b60e0ab8 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: mem.c,v 1.98.2.1 2001/09/05 17:51:13 gson Exp $ */
+/* $Id: mem.c,v 1.98.2.2 2001/10/12 01:17:37 marka Exp $ */
#include <config.h>
@@ -475,6 +475,7 @@ mem_getunlocked(isc_mem_t *ctx, size_t size) {
* don't own.
*/
new_size = size;
+ goto done;
}
/*
diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index 72c252c1..6aa0b347 100644
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: check.c,v 1.14.2.2 2001/10/04 19:43:06 gson Exp $ */
+/* $Id: check.c,v 1.14.2.4 2001/10/11 17:12:42 gson Exp $ */
#include <config.h>
@@ -114,7 +114,7 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, isc_log_t *logctx) {
static optionstable options[] = {
{ "allow-query", MASTERZONE | SLAVEZONE | STUBZONE },
- { "allow-transfer", MASTERZONE | SLAVEZONE | STUBZONE },
+ { "allow-transfer", MASTERZONE | SLAVEZONE },
{ "notify", MASTERZONE | SLAVEZONE },
{ "also-notify", MASTERZONE | SLAVEZONE },
{ "dialup", MASTERZONE | SLAVEZONE | STUBZONE },
@@ -122,8 +122,10 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, isc_log_t *logctx) {
{ "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE},
{ "maintain-ixfr-base", MASTERZONE | SLAVEZONE },
{ "max-ixfr-log-size", MASTERZONE | SLAVEZONE },
- { "transfer-source", MASTERZONE | SLAVEZONE | STUBZONE },
- { "transfer-source-v6", MASTERZONE | SLAVEZONE | STUBZONE },
+ { "notify-source", MASTERZONE | SLAVEZONE },
+ { "notify-source-v6", MASTERZONE | SLAVEZONE },
+ { "transfer-source", SLAVEZONE | STUBZONE },
+ { "transfer-source-v6", SLAVEZONE | STUBZONE },
{ "max-transfer-time-in", SLAVEZONE | STUBZONE },
{ "max-transfer-time-out", MASTERZONE | SLAVEZONE },
{ "max-transfer-idle-in", SLAVEZONE | STUBZONE },
diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index 9ed4c9ba..58c1291c 100644
--- a/lib/isccfg/include/isccfg/log.h
+++ b/lib/isccfg/include/isccfg/log.h
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: log.h,v 1.3 2001/03/13 03:04:08 gson Exp $ */
+/* $Id: log.h,v 1.3.2.1 2001/10/16 05:58:29 marka Exp $ */
#ifndef ISCCFG_LOG_H
#define ISCCFG_LOG_H 1
@@ -23,8 +23,8 @@
#include <isc/lang.h>
#include <isc/log.h>
-extern isc_logcategory_t cfg_categories[];
-extern isc_logmodule_t cfg_modules[];
+LIBISCCFG_EXTERNAL_DATA extern isc_logcategory_t cfg_categories[];
+LIBISCCFG_EXTERNAL_DATA extern isc_logmodule_t cfg_modules[];
#define CFG_LOGCATEGORY_CONFIG (&cfg_categories[0])
diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c
index c5a6686d..e7377dfe 100644
--- a/lib/isccfg/log.c
+++ b/lib/isccfg/log.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: log.c,v 1.2 2001/03/13 03:04:05 gson Exp $ */
+/* $Id: log.c,v 1.2.2.1 2001/10/16 05:58:28 marka Exp $ */
#include <config.h>
@@ -27,7 +27,7 @@
* When adding a new category, be sure to add the appropriate
* #define to <isccfg/log.h>.
*/
-isc_logcategory_t cfg_categories[] = {
+LIBISCCFG_EXTERNAL_DATA isc_logcategory_t cfg_categories[] = {
{ "config", 0 },
{ NULL, 0 }
};
@@ -36,7 +36,7 @@ isc_logcategory_t cfg_categories[] = {
* When adding a new module, be sure to add the appropriate
* #define to <isccfg/log.h>.
*/
-isc_logmodule_t cfg_modules[] = {
+LIBISCCFG_EXTERNAL_DATA isc_logmodule_t cfg_modules[] = {
{ "isccfg/parser", 0 },
{ NULL, 0 }
};
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index bc7b277f..733ef41d 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: parser.c,v 1.70.2.2 2001/09/06 23:06:43 marka Exp $ */
+/* $Id: parser.c,v 1.70.2.3 2001/10/13 03:52:13 marka Exp $ */
#include <config.h>
@@ -2780,14 +2780,16 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
}
}
}
- return (ISC_R_NOTFOUND); /* XXX */
+ return (ISC_R_UNEXPECTEDTOKEN);
}
static isc_result_t
get_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
isc_result_t result;
CHECK(cfg_gettoken(pctx, 0));
- CHECK(token_addr(pctx, flags, na));
+ result = token_addr(pctx, flags, na);
+ if (result == ISC_R_UNEXPECTEDTOKEN)
+ parser_error(pctx, LOG_NEAR, "expected IP address");
cleanup:
return (result);
}
@@ -2943,7 +2945,6 @@ parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
*ret = obj;
return (ISC_R_SUCCESS);
cleanup:
- parser_error(pctx, LOG_NEAR, "expected IP address");
CLEANUP_OBJ(obj);
return (result);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 10:50:23 +0000