NAPTR issue with HPUX
Mark Andrews
Mark_Andrews at isc.org
Wed Mar 14 03:39:36 UTC 2007
> Hi list,
> We are running 2 dns servers with bind 9.0 and HP 11i as the OS. We
> are failing with NAPTR records to resolve as per the below entries.But
> this is working with RedHat Linux AS4.
> Is there any bugs with HPUX for NAPTR records ?
> -----------------------------------------------------------------------------
> -----------------------------
> IN NAPTR 150 50 "s" "SIPS+D2T" "" _sips._tcp.cps1.ims.test.com.
> IN NAPTR 90 50 "s" "SIP+D2T" "" _sip._tcp.cps1.ims.test.com.
> IN NAPTR 100 50 "s" "SIP+D2U" "" _sip._udp.cps1.ims.test.com.
> -----------------------------------------------------------------------------
> -----------------------------
> thanks,
>
> Br
> Navas
There are changes of significance in how NAPTR records are
process by named between 9.1.0 and current.
Does you test zone have white space in front of the first IN
or not? If it don't you have accidently create "IN.zone" rather
than adding NAPTR records at the current ownername.
Mark
Index: bind9/lib/dns/rdata/in_1/naptr_35.c
diff -u bind9/lib/dns/rdata/in_1/naptr_35.c:1.36.4.1 bind9/lib/dns/rdata/in_1/naptr_35.c:1.49
--- bind9/lib/dns/rdata/in_1/naptr_35.c:1.36.4.1 Tue Jan 9 22:48:00 2001
+++ bind9/lib/dns/rdata/in_1/naptr_35.c Fri Apr 29 00:23:20 2005
@@ -1,25 +1,25 @@
/*
- * Copyright (C) 1999-2001 Internet Software Consortium.
+ * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id$ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
-/* RFC 2168 */
+/* RFC2915 */
#ifndef RDATA_IN_1_NAPTR_35_C
#define RDATA_IN_1_NAPTR_35_C
@@ -35,15 +35,17 @@
REQUIRE(type == 35);
REQUIRE(rdclass == 1);
+ UNUSED(type);
UNUSED(rdclass);
+ UNUSED(callbacks);
/*
* Order.
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number,
ISC_FALSE));
- if (token.value.as_ulong > 0xffff)
- return (ISC_R_RANGE);
+ if (token.value.as_ulong > 0xffffU)
+ RETTOK(ISC_R_RANGE);
RETERR(uint16_tobuffer(token.value.as_ulong, target));
/*
@@ -51,8 +53,8 @@
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number,
ISC_FALSE));
- if (token.value.as_ulong > 0xffff)
- return (ISC_R_RANGE);
+ if (token.value.as_ulong > 0xffffU)
+ RETTOK(ISC_R_RANGE);
RETERR(uint16_tobuffer(token.value.as_ulong, target));
/*
@@ -60,21 +62,21 @@
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
ISC_FALSE));
- RETERR(txt_fromtext(&token.value.as_textregion, target));
+ RETTOK(txt_fromtext(&token.value.as_textregion, target));
/*
* Service.
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
ISC_FALSE));
- RETERR(txt_fromtext(&token.value.as_textregion, target));
+ RETTOK(txt_fromtext(&token.value.as_textregion, target));
/*
* Regexp.
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
ISC_FALSE));
- RETERR(txt_fromtext(&token.value.as_textregion, target));
+ RETTOK(txt_fromtext(&token.value.as_textregion, target));
/*
* Replacement.
@@ -84,7 +86,8 @@
dns_name_init(&name, NULL);
buffer_fromregion(&buffer, &token.value.as_region);
origin = (origin != NULL) ? origin : dns_rootname;
- return (dns_name_fromtext(&name, &buffer, origin, downcase, target));
+ RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+ return (ISC_R_SUCCESS);
}
static inline isc_result_t
@@ -93,7 +96,7 @@
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
- char buf[sizeof "64000"];
+ char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 35);
@@ -157,6 +160,7 @@
REQUIRE(type == 35);
REQUIRE(rdclass == 1);
+ UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
@@ -190,12 +194,13 @@
/*
* Replacement.
*/
- return (dns_name_fromwire(&name, source, dctx, downcase, target));
+ return (dns_name_fromwire(&name, source, dctx, options, target));
}
static inline isc_result_t
towire_in_naptr(ARGS_TOWIRE) {
dns_name_t name;
+ dns_offsets_t offsets;
isc_region_t sr;
REQUIRE(rdata->type == 35);
@@ -231,7 +236,7 @@
/*
* Replacement.
*/
- dns_name_init(&name, NULL);
+ dns_name_init(&name, offsets);
dns_name_fromregion(&name, &sr);
return (dns_name_towire(&name, cctx, target));
}
@@ -315,13 +320,11 @@
REQUIRE(source != NULL);
REQUIRE(naptr->common.rdtype == type);
REQUIRE(naptr->common.rdclass == rdclass);
- REQUIRE((naptr->flags == NULL && naptr->flags_len == 0) ||
- (naptr->flags != NULL && naptr->flags_len != 0));
- REQUIRE((naptr->service == NULL && naptr->service_len == 0) ||
- (naptr->service != NULL && naptr->service_len != 0));
- REQUIRE((naptr->regexp == NULL && naptr->regexp_len == 0) ||
- (naptr->regexp != NULL && naptr->regexp_len != 0));
+ REQUIRE(naptr->flags != NULL || naptr->flags_len == 0);
+ REQUIRE(naptr->service != NULL && naptr->service_len == 0);
+ REQUIRE(naptr->regexp != NULL && naptr->regexp_len == 0);
+ UNUSED(type);
UNUSED(rdclass);
RETERR(uint16_tobuffer(naptr->order, target));
@@ -366,34 +369,27 @@
naptr->flags_len = uint8_fromregion(&r);
isc_region_consume(&r, 1);
- if (naptr->flags_len != 0) {
- INSIST(naptr->flags_len <= r.length);
- naptr->flags = mem_maybedup(mctx, r.base, naptr->flags_len);
- if (naptr->flags == NULL)
- goto cleanup;
- isc_region_consume(&r, naptr->flags_len);
- }
+ INSIST(naptr->flags_len <= r.length);
+ naptr->flags = mem_maybedup(mctx, r.base, naptr->flags_len);
+ if (naptr->flags == NULL)
+ goto cleanup;
+ isc_region_consume(&r, naptr->flags_len);
naptr->service_len = uint8_fromregion(&r);
isc_region_consume(&r, 1);
- if (naptr->service_len != 0) {
- INSIST(naptr->service_len <= r.length);
- naptr->service = mem_maybedup(mctx, r.base,
- naptr->service_len);
- if (naptr->service == NULL)
- goto cleanup;
- isc_region_consume(&r, naptr->service_len);
- }
+ INSIST(naptr->service_len <= r.length);
+ naptr->service = mem_maybedup(mctx, r.base, naptr->service_len);
+ if (naptr->service == NULL)
+ goto cleanup;
+ isc_region_consume(&r, naptr->service_len);
naptr->regexp_len = uint8_fromregion(&r);
isc_region_consume(&r, 1);
- if (naptr->regexp_len != 0) {
- INSIST(naptr->regexp_len <= r.length);
- naptr->regexp = mem_maybedup(mctx, r.base, naptr->regexp_len);
- if (naptr->regexp == NULL)
- goto cleanup;
- isc_region_consume(&r, naptr->regexp_len);
- }
+ INSIST(naptr->regexp_len <= r.length);
+ naptr->regexp = mem_maybedup(mctx, r.base, naptr->regexp_len);
+ if (naptr->regexp == NULL)
+ goto cleanup;
+ isc_region_consume(&r, naptr->regexp_len);
dns_name_init(&name, NULL);
dns_name_fromregion(&name, &r);
@@ -438,6 +434,7 @@
static inline isc_result_t
additionaldata_in_naptr(ARGS_ADDLDATA) {
dns_name_t name;
+ dns_offsets_t offsets;
isc_region_t sr;
dns_rdatatype_t atype;
unsigned int i, flagslen;
@@ -483,7 +480,7 @@
/*
* Replacement.
*/
- dns_name_init(&name, NULL);
+ dns_name_init(&name, offsets);
dns_name_fromregion(&name, &sr);
if (atype != 0)
@@ -551,4 +548,31 @@
return (dns_name_digest(&name, digest, arg));
}
+static inline isc_boolean_t
+checkowner_in_naptr(ARGS_CHECKOWNER) {
+
+ REQUIRE(type == 35);
+ REQUIRE(rdclass == 1);
+
+ UNUSED(name);
+ UNUSED(type);
+ UNUSED(rdclass);
+ UNUSED(wildcard);
+
+ return (ISC_TRUE);
+}
+
+static inline isc_boolean_t
+checknames_in_naptr(ARGS_CHECKNAMES) {
+
+ REQUIRE(rdata->type == 35);
+ REQUIRE(rdata->rdclass == 1);
+
+ UNUSED(rdata);
+ UNUSED(owner);
+ UNUSED(bad);
+
+ return (ISC_TRUE);
+}
+
#endif /* RDATA_IN_1_NAPTR_35_C */
--
Mark Andrews, ISC
1 Seymour St., Dundas Valley, NSW 2117, Australia
PHONE: +61 2 9871 4742 INTERNET: Mark_Andrews at isc.org
More information about the bind-users
mailing list