[master] 924f25b Only test acceptor sockets if not -C

Poul-Henning Kamp phk at FreeBSD.org
Mon Mar 16 09:55:34 CET 2015


commit 924f25b189f5c2ff0ff082fd53059adc31418898
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 16 08:48:10 2015 +0000

    Only test acceptor sockets if not -C

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 325b88d..e4849b3 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -619,9 +619,11 @@ main(int argc, char * const *argv)
 		ARGV_ERR("Could not open pid/lock (-P) file (%s): %s\n",
 		    P_arg, strerror(errno));
 
-	if (MAC_open_sockets())
-		ARGV_ERR("Failed to open (any) accept sockets.\n");
-	MAC_close_sockets();
+	if (!C_flag) {
+		if (MAC_open_sockets())
+			ARGV_ERR("Failed to open (any) accept sockets.\n");
+		MAC_close_sockets();
+	}
 
 	mgt_vcc_init();
 	mgt_vcl_init();



More information about the varnish-commit mailing list