Merge pull request #90 from phicoh/cloexec

wcawijngaards · web-flow · commit 38c074dea0a1 · 2020-04-06T08:45:22.000+02:00
O_CLOEXEC should be FD_CLOEXEC
diff --git a/server.c b/server.c
@@ -673,7 +673,7 @@ set_cloexec(struct nsd_socket *sock)
 {
 	assert(sock != NULL);
 
-	if(fcntl(sock->s, F_SETFD, O_CLOEXEC) == -1) {
+	if(fcntl(sock->s, F_SETFD, FD_CLOEXEC) == -1) {
 		const char *socktype =
 			sock->addr.ai_family == SOCK_DGRAM ? "udp" : "tcp";
 		log_msg(LOG_ERR, "fcntl(..., O_CLOEXEC) failed for %s: %s",

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ set_cloexec(struct nsd_socket *sock)`
`673`	`673`	`{`
`674`	`674`	`assert(sock != NULL);`
`675`	`675`
`676`		`- if(fcntl(sock->s, F_SETFD, O_CLOEXEC) == -1) {`
	`676`	`+ if(fcntl(sock->s, F_SETFD, FD_CLOEXEC) == -1) {`
`677`	`677`	`const char *socktype =`
`678`	`678`	`sock->addr.ai_family == SOCK_DGRAM ? "udp" : "tcp";`
`679`	`679`	`log_msg(LOG_ERR, "fcntl(..., O_CLOEXEC) failed for %s: %s",`