r4479 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2010-01-25 12:36:43 +0100 (Mon, 25 Jan 2010)
New Revision: 4479

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_vcc.c
Log:
Don't mess up the vcl name of the VCL created with -f or -b, need to
add proper metadata/comment field.

Spotted by:	Kristian



Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2010-01-22 08:25:26 UTC (rev 4478)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2010-01-25 11:36:43 UTC (rev 4479)
@@ -332,6 +332,8 @@
 	struct vclprog *vp;
 	char buf[BUFSIZ];
 
+	/* XXX: annotate vcl with -b/-f arg so people know where it came from */
+	(void)f_arg;
 	if (b_arg != NULL) {
 		AZ(vcl);
 		/*
@@ -364,10 +366,8 @@
 		free(port);
 		vcl = strdup(buf);
 		AN(vcl);
-		bprintf(buf, "boot (-b %s)", b_arg);
-	} else {
-		bprintf(buf, "boot (-f %s)", f_arg);
 	}
+	strcpy(buf, "boot");
 
 	vf = mgt_VccCompile(&sb, vcl, C_flag);
 	free(vcl);