summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-24 09:08:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-24 09:08:28 (GMT)
commitc6df547a415e4e34165df3d4af40f3eb2cb1cf4f (patch)
tree9b4745618d48b63bbea6ed8d18b233adbafdfdcf
parent2effe71b7c3a78cd20070752e04fb04830e4dd36 (diff)
parent0032d548db56eac9ea09b4ba05843365f6325b85 (diff)
downloadgit-c6df547a415e4e34165df3d4af40f3eb2cb1cf4f.zip
git-c6df547a415e4e34165df3d4af40f3eb2cb1cf4f.tar.gz
git-c6df547a415e4e34165df3d4af40f3eb2cb1cf4f.tar.bz2
Merge branch 'sh/daemon'
* sh/daemon: socksetup: don't return on set_reuse_addr() error
-rw-r--r--daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon.c b/daemon.c
index a1ccda3..776749e 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) {