[master] e83eaaf Separate listen addresses by a newline

[Poul-Henning Kamp]

commit e83eaaf56d437ee1b32b8a46495bf40ea465ec9a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 12 12:54:52 2015 +0000

    Separate listen addresses by a newline

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 129e3bf..b05c43f 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -451,7 +451,7 @@ ccf_listen_address(struct cli *cli, const char * const *av, void *priv)
 		if (ls->sock < 0)
 			continue;
 		VTCP_myname(ls->sock, h, sizeof h, p, sizeof p);
-		VCLI_Out(cli, "%s %s", h, p);
+		VCLI_Out(cli, "%s %s\n", h, p);
 	}
 }
 
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index e9c4b6a..1b154b3 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -532,6 +532,9 @@ varnish_start(struct varnish *v)
 		vtc_log(v->vl, 0,
 		    "CLI debug.listen_address command failed: %u %s", u, resp);
 	h = resp;
+	p = strchr(h, '\n');
+	if (p != NULL)
+		*p = '\0';
 	p = strchr(h, ' ');
 	AN(p);
 	*p++ = '\0';