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

Back out change #2652

Browse Source
This commit is contained in:
Evan Hunt
2009-08-15 05:03:14 +00:00
parent 38cd84d1b3
commit 181b990c21
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,7 +1,3 @@
2652. [bug] lwres_getipnodebyname() and lwres_getipnodebyaddr()
returned a misleading error code when lwresd was
down. [RT #20028]
2651. [bug] Dates could print incorrectly in K*.key files on 2651. [bug] Dates could print incorrectly in K*.key files on
64-bit systems. [RT #20076] 64-bit systems. [RT #20076]

16
lib/lwres/getipnode.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: getipnode.c,v 1.43 2009/08/15 03:11:57 each Exp $ */ /* $Id: getipnode.c,v 1.44 2009/08/15 05:03:14 each Exp $ */
/*! \file */ /*! \file */
@@ -285,10 +285,7 @@ lwres_getipnodebyname(const char *name, int af, int flags, int *error_num) {
goto cleanup; goto cleanup;
} }
} else { } else {
if (n == LWRES_R_NOTFOUND)
tmp_err = HOST_NOT_FOUND; tmp_err = HOST_NOT_FOUND;
else
tmp_err = NO_RECOVERY;
} }
} }
@@ -440,15 +437,9 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
if (n != 0) { if (n != 0) {
lwres_conf_clear(lwrctx); lwres_conf_clear(lwrctx);
lwres_context_destroy(&lwrctx); lwres_context_destroy(&lwrctx);
if (n == LWRES_R_NOTFOUND)
*error_num = HOST_NOT_FOUND; *error_num = HOST_NOT_FOUND;
else
*error_num = NO_RECOVERY;
return (NULL); return (NULL);
} }
he1 = hostfromaddr(by, AF_INET6, src); he1 = hostfromaddr(by, AF_INET6, src);
lwres_gnbaresponse_free(lwrctx, &by); lwres_gnbaresponse_free(lwrctx, &by);
if (he1 == NULL) if (he1 == NULL)
@@ -845,11 +836,6 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
int len = 0; int len = 0;
char **cpp, **npp; char **cpp, **npp;
/* If there is an unrecoverable error, the other steps are useless */
if (*error_num == NO_RECOVERY)
goto no_recovery;
/* /*
* Work out array sizes. * Work out array sizes.
*/ */