Pass ident via heritage.

bin/varnishd/cache/cache_panic.c

@@ -630,7 +630,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
 	VSB_printf(pan_vsb, "version = %s, vrt api = %u.%u\n",
 	    VCS_version, VRT_MAJOR_VERSION, VRT_MINOR_VERSION);
 	VSB_printf(pan_vsb, "ident = %s,%s\n",
-	    VSB_data(vident) + 1, Waiter_GetName());
+	    heritage.ident + 1, Waiter_GetName());
 	VSB_printf(pan_vsb, "now = %f (mono), %f (real)\n",
 	    VTIM_mono(), VTIM_real());
 

bin/varnishd/common/common.h

@@ -50,15 +50,9 @@
 #  define MAX_THREAD_POOLS 32
 #endif
 
-/* Name of transient storage */
-#define TRANSIENT_STORAGE	"Transient"
-
 extern pid_t mgt_pid;
 #define ASSERT_MGT() do { assert(getpid() == mgt_pid);} while (0)
 
-/* varnishd.c */
-extern struct vsb *vident;		// XXX: -> heritage ?
-
 /* Really belongs in mgt.h, but storage_file chokes on both */
 void MCH_Fd_Inherit(int fd, const char *what);
 

bin/varnishd/common/heritage.h

@@ -84,6 +84,8 @@ struct heritage {
 	ssize_t				panic_str_len;
 
 	struct VCLS			*cls;
+
+	const char			*ident;
 };
 
 extern struct heritage heritage;

bin/varnishd/mgt/mgt.h

@@ -135,6 +135,7 @@ extern const struct jail_tech jail_tech_unix;
 extern const struct jail_tech jail_tech_solaris;
 
 /* mgt_main.c */
+extern struct vsb *vident;
 extern struct VSC_mgt	*VSC_C_mgt;
 struct choice {
 	const char      *name;

bin/varnishd/mgt/mgt_child.c

@@ -366,6 +366,7 @@ mgt_launch_child(struct cli *cli)
 		mgt_ProcTitle("Child");
 
 		heritage.cls = mgt_cls;
+		heritage.ident = VSB_data(vident) + 1;
 
 		if (mgt_param.sigsegv_handler) {
 			memset(&sa, 0, sizeof sa);

bin/varnishd/storage/mgt_stevedore.c

@@ -46,6 +46,9 @@
 static VTAILQ_HEAD(, stevedore) stevedores =
     VTAILQ_HEAD_INITIALIZER(stevedores);
 
+/* Name of transient storage */
+#define TRANSIENT_STORAGE	"Transient"
+
 struct stevedore *stv_transient;
 
 /*--------------------------------------------------------------------*/