summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2006-04-18 08:11:06 -0500
committerJunio C Hamano <junkio@cox.net>2006-04-24 23:07:54 -0700
commit7d09fbe4ab7f080a8f8f5dcef7e0f3edf5e26019 (patch)
tree9fbfa7581e3f865033351994c2946016da0f52f7
parent1ab661ddb7eb564c1c3cb97a512257860a651459 (diff)
downloadgit-7d09fbe4ab7f080a8f8f5dcef7e0f3edf5e26019.tar.gz
socksetup: don't return on set_reuse_addr() errorv1.3.1
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)
-rw-r--r--daemon.c2
1 files changed, 1 insertions, 1 deletions
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) {