daemon: ignore ENOTSOCK from setsockopt

Eric Wong · gitster · commit 49c58d86ceb7 · 2016-07-18T11:09:52.000-07:00
In inetd mode, we are not guaranteed stdin or stdout is a
socket; callers could filter the data through a pipe
or be testing with regular files.

This prevents t5802 from polluting syslog.

Signed-off-by: Eric Wong &lt;e@80x24.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/daemon.c b/daemon.c
@@ -673,9 +673,11 @@ static void set_keep_alive(int sockfd)
 {
 	int ka = 1;
 
-	if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)
-		logerror("unable to set SO_KEEPALIVE on socket: %s",
-			strerror(errno));
+	if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) {
+		if (errno != ENOTSOCK)
+			logerror("unable to set SO_KEEPALIVE on socket: %s",
+				strerror(errno));
+	}
 }
 
 static int execute(void)

Original file line number	Diff line number	Diff line change
`@@ -673,9 +673,11 @@ static void set_keep_alive(int sockfd)`
`673`	`673`	`{`
`674`	`674`	`int ka = 1;`
`675`	`675`
`676`		`- if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)`
`677`		`- logerror("unable to set SO_KEEPALIVE on socket: %s",`
`678`		`- strerror(errno));`
	`676`	`+ if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) {`
	`677`	`+ if (errno != ENOTSOCK)`
	`678`	`+ logerror("unable to set SO_KEEPALIVE on socket: %s",`
	`679`	`+ strerror(errno));`
	`680`	`+ }`
`679`	`681`	`}`
`680`	`682`
`681`	`683`	`static int execute(void)`