diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-11-07 09:28:16 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-11-07 09:28:16 -0800 |
| commit | 2624bca9978f181bc533a442304cd3a1f3b56b77 (patch) | |
| tree | cf2ca36b8f72dc9284b5e64f4669faf2cc19070a | |
| parent | ab2b8309141990ea3bc265368dead9fee8c8a71b (diff) | |
| download | adns-2624bca9978f181bc533a442304cd3a1f3b56b77.tar.gz adns-2624bca9978f181bc533a442304cd3a1f3b56b77.tar.bz2 adns-2624bca9978f181bc533a442304cd3a1f3b56b77.zip | |
adns-ocloexec
| -rw-r--r-- | src/event.c | 2 | ||||
| -rw-r--r-- | src/setup.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/event.c b/src/event.c index ad5861e..b30377e 100644 --- a/src/event.c +++ b/src/event.c @@ -123,7 +123,7 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) { adns__diag(ads,-1,0,"unable to find protocol no. for TCP !"); return; } - fd= socket(AF_INET,SOCK_STREAM,proto->p_proto); + fd= socket(AF_INET,SOCK_STREAM|SOCK_CLOEXEC,proto->p_proto); if (fd<0) { adns__diag(ads,-1,0,"cannot create TCP socket: %s",strerror(errno)); return; diff --git a/src/setup.c b/src/setup.c index 57037cc..18b53be 100644 --- a/src/setup.c +++ b/src/setup.c @@ -464,7 +464,7 @@ static const char *instrum_getenv(adns_state ads, const char *envvar) { static void readconfig(adns_state ads, const char *filename, int warnmissing) { getline_ctx gl_ctx; - gl_ctx.file= fopen(filename,"r"); + gl_ctx.file= fopen(filename,"re"); if (!gl_ctx.file) { if (errno == ENOENT) { if (warnmissing) @@ -572,7 +572,7 @@ static int init_finish(adns_state ads) { } proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; } - ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto); + ads->udpsocket= socket(AF_INET,SOCK_DGRAM|SOCK_CLOEXEC,proto->p_proto); if (ads->udpsocket<0) { r= errno; goto x_free; } r= adns__setnonblock(ads,ads->udpsocket); |