From: Junio C Hamano <junkio@cox.net>
Date: Mon, 24 Apr 2006 09:08:28 +0000 (-0700)
Subject: Merge branch 'sh/daemon'
X-Git-Tag: v1.4.0-rc1~220
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c6df547a415e4e34165df3d4af40f3eb2cb1cf4f?hp=2effe71b7c3a78cd20070752e04fb04830e4dd36

Merge branch 'sh/daemon'

* sh/daemon:
socksetup: don't return on set_reuse_addr() error
---

diff --git a/daemon.c b/daemon.c
index a1ccda30e2..776749e343 100644
--- a/daemon.c
+++ b/daemon.c
@@ -535,7 +535,7 @@ static int socksetup(int port, int **socklist_p)
 
 		if (set_reuse_addr(sockfd)) {
 			close(sockfd);
-			return 0;	/* not fatal */
+			continue;
 		}
 
 		if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {