Code

socksetup: don't return on set_reuse_addr() error v1.3.1
authorSerge E. Hallyn <serue@us.ibm.com>
Tue, 18 Apr 2006 13:11:06 +0000 (08:11 -0500)
committerJunio C Hamano <junkio@cox.net>
Tue, 25 Apr 2006 06:07:54 +0000 (23:07 -0700)
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)

daemon.c

index a1ccda30e2211368c66c1186437891f548f0e338..776749e3432fca916981d73d04a1fa19ed3d88b8 100644 (file)
--- 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) {