From 0e43d16b4c5f09c1f13b4709947ca7f577c270fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20R=C3=B6thke?= Date: Tue, 7 May 2019 16:59:28 +0200 Subject: [PATCH 1/2] bgpd: add missing newline to a warning message in the rpki module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Röthke --- bgpd/bgp_rpki.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index c63d4f9ad2..32368a8efd 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -1112,7 +1112,7 @@ DEFPY (rpki_cache, vty_out(vty, "ssh sockets are not supported. " "Please recompile rtrlib and frr with ssh support. " - "If you want to use it"); + "If you want to use it\n"); #endif } else { // use tcp connection return_value = add_tcp_cache(cache, tcpport, preference); From fef6fafa909f80d0f8f8623fde50d9686e4b56e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20R=C3=B6thke?= Date: Tue, 7 May 2019 17:00:30 +0200 Subject: [PATCH 2/2] bgpd: fix rpki module build without ssh support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Röthke --- bgpd/bgp_rpki.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 32368a8efd..010322233d 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -1253,6 +1253,7 @@ DEFUN (show_rpki_cache_server, cache->tr_config.tcp_config->host, cache->tr_config.tcp_config->port); +#if defined(FOUND_SSH) } else if (cache->type == SSH) { vty_out(vty, "host: %s port: %d username: %s " @@ -1264,6 +1265,7 @@ DEFUN (show_rpki_cache_server, ->server_hostkey_path, cache->tr_config.ssh_config ->client_privkey_path); +#endif } }