Always initialise vd->dname

This was lost in commit 74328de8. Fixes #2412.

Always initialise vd->dname
This was lost in commit 74328de8. Fixes #2412.
7d7fef63 · Federico G. Schwindt · Pål Hermunn Johansen · e8402806 · 7d7fef63
Commit 7d7fef63 authored Sep 04, 2017 by Federico G. Schwindt Committed by Pål Hermunn Johansen Sep 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

vsm.c lib/libvarnishapi/vsm.c +9 -1

No files found.
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -531,7 +531,7 @@ VSM_Attach(struct vsm *vd, int progress)
 {
 	double t0;
 	unsigned u;
-	int n = 0;
+	int i, n = 0;

 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);

@@ -540,6 +540,14 @@ VSM_Attach(struct vsm *vd, int progress)
 	else
 		t0 = VTIM_mono() + vd->patience;

+	if (vd->dname == NULL) {
+		/* Use default (hostname) */
+		i = VSM_Arg(vd, 'n', "");
+		if (i < 0)
+			return (i);
+		AN(vd->dname);
+	}
+
 	AZ(vd->attached);
 	while (1) {
 		u = VSM_Status(vd);