git-daemon not listening when compiled with -DNO_IPV6

Paul Serice · Junio C Hamano · commit f35230fb1123 · 2005-11-21T14:36:43.000-08:00
git-daemon was not listening when compiled with -DNO_IPV6.
socksetup() was not returning socket count when compiled with -DNO_IPV6.

Signed-off-by: Paul Serice &lt;paul@serice.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/daemon.c b/daemon.c
@@ -466,8 +466,14 @@ static int socksetup(int port, int **socklist_p)
 		return 0;
 	}
 
+	if (listen(sockfd, 5) < 0) {
+		close(sockfd);
+		return 0;
+	}
+
 	*socklist_p = xmalloc(sizeof(int));
 	**socklist_p = sockfd;
+	return 1;
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -466,8 +466,14 @@ static int socksetup(int port, int **socklist_p)`
`466`	`466`	`return 0;`
`467`	`467`	`}`
`468`	`468`
	`469`	`+ if (listen(sockfd, 5) < 0) {`
	`470`	`+ close(sockfd);`
	`471`	`+ return 0;`
	`472`	`+ }`
	`473`	`+`
`469`	`474`	`*socklist_p = xmalloc(sizeof(int));`
`470`	`475`	`**socklist_p = sockfd;`
	`476`	`+ return 1;`
`471`	`477`	`}`
`472`	`478`
`473`	`479`	`#endif`