diff options
| author | Roland McGrath <roland@gnu.org> | 1995-04-24 09:00:07 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-04-24 09:00:07 +0000 |
| commit | 11872325e2cf0443e17d50eebbf883eb0c24ea27 (patch) | |
| tree | 7b43aa9bc213e898d1f3add3cb6b6fec42503086 /resolv/res_init.c | |
| parent | b96bdcd7d92fb44e9e2ad2458fdff03bda715151 (diff) | |
| download | glibc-11872325e2cf0443e17d50eebbf883eb0c24ea27.zip glibc-11872325e2cf0443e17d50eebbf883eb0c24ea27.tar.gz glibc-11872325e2cf0443e17d50eebbf883eb0c24ea27.tar.bz2 | |
Sat Apr 22 14:48:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* mach/Machrules [interface-library]
(LDFLAGS-$(interface-library:lib%=%.so)): New variable, set to
-nostdlib.
* sysdeps/mach/hurd/fork.c: Subfunction `unlockss' removed. Lock
_hurd_siglock only around initial task creation in parent. Use
_hurd_critical_section_unlock at end. Handle dead name rights
properly, and deal with a send right dying while we try to copy
it. For the time being, use assert_perror for kernel and proc RPC
failures.
Fri Apr 21 01:10:15 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* extra-lib.mk: Don't include $(o-iterator); construct it by hand
using $(object-suffixes-$(lib)) instead.
* sysdeps/mach/hurd/Makefile (LDLIBS-c.so): New variable.
* Makerules (lib%.so: lib%_pic.a): Pass $(LDFLAGS-$(notdir $*).so).
(LDFLAGS-c.so): New variable.
* resolv/res_init.c (res_init): Don't clobber _res.options with
RES_DEFAULT. If RES_INIT is clear, OR in RES_DEFAULT.
* hurd/hurd.h: Declare _hurd_startup.
* hurd/hurdstartup.c: New file.
* hurd/Makefile (routines): Add hurdstartup.
Diffstat (limited to 'resolv/res_init.c')
| -rw-r--r-- | resolv/res_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resolv/res_init.c b/resolv/res_init.c index 0092dbc..98807ff 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -177,8 +177,8 @@ res_init() _res.retrans = RES_TIMEOUT; if (!_res.retry) _res.retry = 4; - if (!_res.options) - _res.options = RES_DEFAULT; + if (!(_res.options & RES_INIT)) + _res.options |= RES_DEFAULT; #ifdef USELOOPBACK _res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1); |