diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-08-09 06:41:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-08-09 06:41:04 +0000 |
| commit | c14e91352e26aa4e1622f08bb9a25a9527a8db2b (patch) | |
| tree | bb3fe3f376564b7a9cf5ca4d6d89c0ad55e6a276 /resolv/res_query.c | |
| parent | 807645d725f68619543836e196ae49f7b5fb5505 (diff) | |
| download | glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.tar glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.tar.gz glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.tar.bz2 glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.zip | |
[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 <greg@mathworks.com>.
Diffstat (limited to 'resolv/res_query.c')
| -rw-r--r-- | resolv/res_query.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/resolv/res_query.c b/resolv/res_query.c index f6d7f16dab..bad1495467 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,"<<aaaa\n",7); - #ifdef DEBUG if (statp->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 |