[4.1] 560de22 Be a bit more clear on this, hoping Coverity will catch the drift.

Poul-Henning Kamp phk at FreeBSD.org
Fri Sep 4 15:54:53 CEST 2015


commit 560de22727110d18fc8006f288fbde9223d5902b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 10 06:55:04 2015 +0000

    Be a bit more clear on this, hoping Coverity will catch the drift.

diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 0c28a13..8c80f58 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -62,13 +62,15 @@ mac_opensocket(struct listen_sock *ls, struct cli *cli)
 	}
 	ls->sock = VTCP_bind(ls->addr, NULL);
 	fail = errno;
-	if (ls->sock >= 0)
-		mgt_child_inherit(ls->sock, "sock");
-	if (cli != NULL && ls->sock < 0) {
-		VCLI_Out(cli, "Could not get socket %s: %s\n",
-		    ls->name, strerror(errno));
+	if (ls->sock < 0) {
+		if (cli != NULL)
+			VCLI_Out(cli, "Could not get socket %s: %s\n",
+			    ls->name, strerror(errno));
+		AN(fail);
+		return (fail);
 	}
-	return (fail);
+	mgt_child_inherit(ls->sock, "sock");
+	return (0);
 }
 
 /*=====================================================================
@@ -152,7 +154,7 @@ MAC_Validate(void)
 		VJ_master(JAIL_MASTER_PRIVPORT);
 		fail = mac_opensocket(ls, NULL);
 		VJ_master(JAIL_MASTER_LOW);
-		if (ls->sock < 0)
+		if (fail)
 			ARGV_ERR("Cannot open socket: %s: %s\n",
 			    ls->name, strerror(fail));
 		if (VSA_Port(ls->addr) == 0) {



More information about the varnish-commit mailing list