Merge branch 'sh/daemon' into next

* sh/daemon:
  socksetup: don't return on set_reuse_addr() error
This commit is contained in:
Junio C Hamano
2006-04-18 14:41:57 -07:00

View File

@ -535,7 +535,7 @@ static int socksetup(int port, int **socklist_p)
if (set_reuse_addr(sockfd)) { if (set_reuse_addr(sockfd)) {
close(sockfd); close(sockfd);
return 0; /* not fatal */ continue;
} }
if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {