[4.1] b16b673 Allow ACLs to be used outside of transactions

Lasse Karstensen lkarsten at varnish-software.com
Thu Feb 25 15:11:14 CET 2016


commit b16b6733d6a0f3c415e3412cf2b8bf5f63c43953
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Feb 23 16:22:34 2016 +0100

    Allow ACLs to be used outside of transactions

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 09441e0..665dcf3 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -67,7 +67,11 @@ VRT_acl_log(VRT_CTX, const char *msg)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	VSLb(ctx->vsl, SLT_VCL_acl, "%s", msg);
+	AN(msg);
+	if (ctx->vsl != NULL)
+		VSLb(ctx->vsl, SLT_VCL_acl, "%s", msg);
+	else
+		VSL(SLT_VCL_acl, 0, "%s", msg);
 }
 
 /*--------------------------------------------------------------------*/



More information about the varnish-commit mailing list