[master] 73ad1590c tell the truth about vmod filenames

[Nils Goroll]

commit 73ad1590c44f88fee308b32ae4768cc707fec078
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Jun 27 19:52:39 2018 +0200

    tell the truth about vmod filenames

diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index 4e11ce5fe..ffd039ebc 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -93,7 +93,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
 
 	dlhdl = dlopen(backup, RTLD_NOW | RTLD_LOCAL);
 	if (dlhdl == NULL) {
-		VSB_printf(ctx->msg, "Loading vmod %s from %s:\n", nm, backup);
+		VSB_printf(ctx->msg, "Loading vmod %s from %s (%s):\n",
+		    nm, backup, path);
 		VSB_printf(ctx->msg, "dlopen() failed: %s\n", dlerror());
 		return (1);
 	}
@@ -113,8 +114,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
 		if (d == NULL ||
 		    d->file_id == NULL ||
 		    strcmp(d->file_id, file_id)) {
-			VSB_printf(ctx->msg,
-			    "Loading vmod %s from %s:\n", nm, path);
+			VSB_printf(ctx->msg, "Loading vmod %s from %s (%s):\n",
+			    nm, backup, path);
 			VSB_printf(ctx->msg,
 			    "This is no longer the same file seen by"
 			    " the VCL-compiler.\n");
@@ -129,8 +130,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
 		    d->func_len <= 0 ||
 		    d->proto == NULL ||
 		    d->json == NULL) {
-			VSB_printf(ctx->msg,
-			    "Loading VMOD %s from %s:\n", nm, path);
+			VSB_printf(ctx->msg, "Loading vmod %s from %s (%s):\n",
+			    nm, backup, path);
 			VSB_printf(ctx->msg, "VMOD data is mangled.\n");
 			(void)dlclose(v->hdl);
 			FREE_OBJ(v);