Merge branch 'sh/daemon'

Junio C Hamano · Junio C Hamano · commit c6df547a415e · 2006-04-24T02:08:28.000-07:00
* sh/daemon:
  socksetup: don't return on set_reuse_addr() error
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ static int socksetup(int port, int **socklist_p)`
`535`	`535`
`536`	`536`	`if (set_reuse_addr(sockfd)) {`
`537`	`537`	`close(sockfd);`
`538`		`- return 0; /* not fatal */`
	`538`	`+ continue;`
`539`	`539`	`}`
`540`	`540`
`541`	`541`	`if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {`