[PATCH 03/21] netlink: Remove a newline from p-t-p startup message

Ian Jackson ijackson at chiark.greenend.org.uk
Thu Apr 24 02:37:22 BST 2014


Another newline will be printed later, after the routes.  With one
link per tunnel it's better to make these messages (of which there are
many) one line each.

Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
---
 debian/changelog |    1 +
 netlink.c        |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 12b009c..9f02f1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ secnet (0.3.1~~unstable) unstable; urgency=low
   * Fix formatting error in secnet.8 manpage.
   * Internal code rearrangements and improvements.
   * Fix netlink SEGV on clientless netlinks (i.e. configuration error).
+  * Fix formatting error in p-t-p startup message.
 
  --
 
diff --git a/netlink.c b/netlink.c
index 6384c02..794bffe 100644
--- a/netlink.c
+++ b/netlink.c
@@ -765,7 +765,7 @@ static void netlink_dump_routes(struct netlink *st, bool_t requested)
     if (requested) c=M_WARNING;
     if (st->ptp) {
 	net=ipaddr_to_string(st->secnet_address);
-	Message(c,"%s: point-to-point (remote end is %s); routes:\n",
+	Message(c,"%s: point-to-point (remote end is %s); routes: ",
 		st->name, net);
 	free(net);
 	netlink_output_subnets(st,c,st->clients->subnets);
-- 
1.7.10.4




More information about the sgo-software-discuss mailing list