r4654 - trunk/varnish-cache/bin/varnishd

phk at varnish-cache.org phk at varnish-cache.org
Mon Apr 12 09:38:05 CEST 2010


Author: phk
Date: 2010-04-12 09:38:05 +0200 (Mon, 12 Apr 2010)
New Revision: 4654

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
Log:
Reject "auth" command if no -S argument given.



Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2010-04-08 16:42:20 UTC (rev 4653)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2010-04-12 07:38:05 UTC (rev 4654)
@@ -293,7 +293,11 @@
 
 	AN(av[2]);
 	(void)priv;
-	AN(secret_file);
+	if (secret_file == NULL) {
+		cli_out(cli, "Secret file not configured\n");
+		cli_result(cli, CLIS_CANT);
+		return;
+	}
 	fd = open(secret_file, O_RDONLY);
 	if (fd < 0) {
 		cli_out(cli, "Cannot open secret file (%s)\n",




More information about the varnish-commit mailing list