From c14e91352e26aa4e1622f08bb9a25a9527a8db2b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 9 Aug 2004 06:41:04 +0000 Subject: [BZ #116] Update. * elf/dl-load.c (_dl_map_object): If __RTLD_CALLMAP flag is set, reset loader before the actual loading. * elf/dl-open.c (dl_open_worker): If file name contains no path element determine map of caller. Pass caller map in this case to _dl_map_object. Set __RTLD_CALLMAP in mode. * include/dlfcn.h (__RTLD_CALLMAP): Define. [BZ #116] Patch by Greg Wolodkin . --- resolv/res_query.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'resolv/res_query.c') diff --git a/resolv/res_query.c b/resolv/res_query.c index f6d7f16..bad1495 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -391,8 +391,6 @@ __libc_res_nquerydomain(res_state statp, const char *longname = nbuf; int n, d; - write(2,"<options & RES_DEBUG) printf(";; res_nquerydomain(%s, %s, %d, %d)\n", @@ -423,11 +421,8 @@ __libc_res_nquerydomain(res_state statp, } sprintf(nbuf, "%s.%s", name, domain); } - int r = (__libc_res_nquery(statp, longname, class, type, answer, + return (__libc_res_nquery(statp, longname, class, type, answer, anslen, answerp)); - write(2,">>aaaa\n",7); - return r; - } int -- cgit v1.1