Commit 181b990c authored by Evan Hunt's avatar Evan Hunt
Browse files

Back out change #2652

parent 38cd84d1
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
64-bit systems. [RT #20076]
......
......@@ -15,7 +15,7 @@
* 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 */
......@@ -285,10 +285,7 @@ lwres_getipnodebyname(const char *name, int af, int flags, int *error_num) {
goto cleanup;
}
} else {
if (n == LWRES_R_NOTFOUND)
tmp_err = HOST_NOT_FOUND;
else
tmp_err = NO_RECOVERY;
tmp_err = HOST_NOT_FOUND;
}
}
......@@ -440,15 +437,9 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
if (n != 0) {
lwres_conf_clear(lwrctx);
lwres_context_destroy(&lwrctx);
if (n == LWRES_R_NOTFOUND)
*error_num = HOST_NOT_FOUND;
else
*error_num = NO_RECOVERY;
*error_num = HOST_NOT_FOUND;
return (NULL);
}
he1 = hostfromaddr(by, AF_INET6, src);
lwres_gnbaresponse_free(lwrctx, &by);
if (he1 == NULL)
......@@ -845,11 +836,6 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
int len = 0;
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.
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment