From: Serge E. Hallyn <serue@us.ibm.com>
Date: Tue, 18 Apr 2006 13:11:06 +0000 (-0500)
Subject: socksetup: don't return on set_reuse_addr() error
X-Git-Tag: v1.3.1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fa7bd724f61bcdcd71ef579f7b94b72bda1298cf;p=git.git

socksetup: don't return on set_reuse_addr() error

The set_reuse_addr() error case was the only error case in
socklist() where we returned rather than continued.  Not sure
why.  Either we must free the socklist, or continue.  This patch
continues on error.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit)
---

diff --git a/daemon.c b/daemon.c
index a1ccda30e..776749e34 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) {