[master] f990990 Fix varnishd -C

Federico G. Schwindt fgsch at lodoss.net
Thu Apr 30 23:16:01 CEST 2015


commit f9909907254d07fa72a842f985cac29d4a28fe95
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Apr 29 20:26:41 2015 +0100

    Fix varnishd -C
    
    Broken in ac69df7db6ea97dc244df357e14013e720fe9801.

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 2544890..c5413ad 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -674,8 +674,7 @@ main(int argc, char * const *argv)
 
 	if (b_arg != NULL || f_arg != NULL) {
 		mgt_vcc_default(cli, b_arg, vcl, C_flag);
-		if (C_flag) {
-			cli_check(cli);
+		if (C_flag && cli->result == CLIS_OK) {
 			AZ(VSB_finish(cli->sb));
 			fprintf(stderr, "%s\n", VSB_data(cli->sb));
 			exit(0);



More information about the varnish-commit mailing list