oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fix res_nsearch call, but don't use it for now, AIX5 has a broken

Browse Source 
version that trashes memory


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11419 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-09-09 21:39:19 +00:00
parent 2a4482fa44
commit 14a69cb275
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/roken/resolve.c
View File

@@ -47,7 +47,8 @@
RCSID("$Id$"); RCSID("$Id$");
#if defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND) #undef HAVE_RES_NSEARCH
#if (defined(HAVE_RES_SEARCH) || defined(HAVE_RES_NSEARCH)) && defined(HAVE_DN_EXPAND)
#define DECL(X) {#X, T_##X} #define DECL(X) {#X, T_##X}
@@ -369,19 +370,18 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
{ {
unsigned char reply[1024]; unsigned char reply[1024];
int len; int len;
#if defined(HAVE__RES) || defined(HAVE_RES_NSEARCH)
u_long old_options = 0;
#endif
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
res_state statp; struct __res_state stat;
if(res_ninit(statp)) memset(&stat, 0, sizeof(stat));
if(res_ninit(&stat))
return NULL; /* is this the best we can do? */ return NULL; /* is this the best we can do? */
#elif defined(HAVE__RES)
u_long old_options = 0;
#endif #endif
if (_resolve_debug) { if (_resolve_debug) {
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
old_options = statp.options; stat.options |= RES_DEBUG;
statp.options |= RES_DEBUG;
#elif defined(HAVE__RES) #elif defined(HAVE__RES)
old_options = _res.options; old_options = _res.options;
_res.options |= RES_DEBUG; _res.options |= RES_DEBUG;
@@ -390,21 +390,19 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
rr_class, dns_type_to_string(rr_type)); rr_class, dns_type_to_string(rr_type));
} }
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
len = res_nsearch(statp, domain, rr_class, rr_type, reply, sizeof(reply)); len = res_nsearch(&stat, domain, rr_class, rr_type, reply, sizeof(reply));
#else #else
len = res_search(domain, rr_class, rr_type, reply, sizeof(reply)); len = res_search(domain, rr_class, rr_type, reply, sizeof(reply));
#endif #endif
if (_resolve_debug) { if (_resolve_debug) {
#ifdef HAVE_RES_NSEARCH #if defined(HAVE__RES) && !defined(HAVE_RES_NSEARCH)
statp.options = old_options;
#elif defined(HAVE__RES)
_res.options = old_options; _res.options = old_options;
#endif #endif
fprintf(stderr, "dns_lookup(%s, %d, %s) --> %d\n", fprintf(stderr, "dns_lookup(%s, %d, %s) --> %d\n",
domain, rr_class, dns_type_to_string(rr_type), len); domain, rr_class, dns_type_to_string(rr_type), len);
} }
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
res_nclose(statp); res_nclose(&stat);
#endif #endif
if(len < 0) { if(len < 0) {
return NULL; return NULL;