mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Fixed a few errors in error recovery and uses of int instead of lwres_result_t

Browse Source
This commit is contained in:
Brian Wellington
2000-06-26 23:23:28 +00:00
parent 1a8cda5f0d
commit 347ccc2716
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/lwres/getipnode.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: getipnode.c,v 1.20 2000/06/22 21:59:28 tale Exp $ */ /* $Id: getipnode.c,v 1.21 2000/06/26 23:23:28 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -218,7 +218,7 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
struct hostent *he1, *he2; struct hostent *he1, *he2;
lwres_context_t *lwrctx = NULL; lwres_context_t *lwrctx = NULL;
lwres_gnbaresponse_t *by = NULL; lwres_gnbaresponse_t *by = NULL;
int n; lwres_result_t n;
union { union {
const void *konst; const void *konst;
struct in6_addr *in6; struct in6_addr *in6;
@@ -272,10 +272,10 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
if (af == AF_INET6) if (af == AF_INET6)
cp += 12; cp += 12;
n = lwres_context_create(&lwrctx, NULL, NULL, NULL, 0); n = lwres_context_create(&lwrctx, NULL, NULL, NULL, 0);
if (n == 0) if (n == LWRES_R_SUCCESS)
n = lwres_getnamebyaddr(lwrctx, LWRES_ADDRTYPE_V4, n = lwres_getnamebyaddr(lwrctx, LWRES_ADDRTYPE_V4,
INADDRSZ, cp, &by); INADDRSZ, cp, &by);
if (n != 0) { if (n != LWRES_R_SUCCESS) {
lwres_context_destroy(&lwrctx); lwres_context_destroy(&lwrctx);
*error_num = HOST_NOT_FOUND; *error_num = HOST_NOT_FOUND;
return (NULL); return (NULL);
@@ -309,7 +309,7 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
} }
n = lwres_context_create(&lwrctx, NULL, NULL, NULL, 0); n = lwres_context_create(&lwrctx, NULL, NULL, NULL, 0);
if (n == 0) if (n == LWRES_R_SUCCESS)
n = lwres_getnamebyaddr(lwrctx, LWRES_ADDRTYPE_V6, IN6ADDRSZ, n = lwres_getnamebyaddr(lwrctx, LWRES_ADDRTYPE_V6, IN6ADDRSZ,
src, &by); src, &by);
if (n != 0) { if (n != 0) {
@@ -711,6 +711,8 @@ hostfromaddr(lwres_gnbaresponse_t *addr, int af, const void *src) {
* Copy aliases. * Copy aliases.
*/ */
he->h_aliases = malloc(sizeof(char *) * (addr->naliases + 1)); he->h_aliases = malloc(sizeof(char *) * (addr->naliases + 1));
if (he->h_aliases == NULL)
goto cleanup;
for (i = 0 ; i < addr->naliases; i++) { for (i = 0 ; i < addr->naliases; i++) {
he->h_aliases[i] = strdup(addr->aliases[i]); he->h_aliases[i] = strdup(addr->aliases[i]);
if (he->h_aliases[i] == NULL) if (he->h_aliases[i] == NULL)
@@ -744,6 +746,7 @@ hostfromaddr(lwres_gnbaresponse_t *addr, int af, const void *src) {
} }
if (he != NULL && he->h_name != NULL) if (he != NULL && he->h_name != NULL)
free(he->h_name); free(he->h_name);
if (he != NULL)
free(he); free(he);
return (NULL); return (NULL);
} }
@@ -822,6 +825,7 @@ hostfromname(lwres_gabnresponse_t *name, int af) {
} }
if (he != NULL && he->h_name != NULL) if (he != NULL && he->h_name != NULL)
free(he->h_name); free(he->h_name);
if (he != NULL)
free(he); free(he);
return (NULL); return (NULL);
} }