From: Louis Scalbert <louis.scalbert@6wind.com>
Date: Thu, 21 Dec 2023 10:41:53 +0000 (+0100)
Subject: bgpd: fix rpki compilation without rtrlib ssh
X-Git-Tag: base_10.0~115^2~10
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f8875f53d69509a151249efff4ecaa0c9122c1f8;p=mirror%2Ffrr.git

bgpd: fix rpki compilation without rtrlib ssh

Fix RPKI module compilation when rtrlib is compiled without SSH support,
ie. with cmake option:

> -D RTRLIB_TRANSPORT_SSH=No

> bgpd/bgp_rpki.c: In function ‘config_write’:
> bgpd/bgp_rpki.c:1062:3: error: enumeration value ‘SSH’ not handled in switch [-Werror=switch-enum]
>  1062 |   switch (cache->type) {
>       |   ^~~~~~
> bgpd/bgp_rpki.c: In function ‘show_rpki_cache_connection_magic’:
> bgpd/bgp_rpki.c:1598:3: error: enumeration value ‘SSH’ not handled in switch [-Werror=switch-enum]
>  1598 |   switch (cache->type) {
>       |   ^~~~~~
> cc1: all warnings being treated as errors

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
---

diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 546438551e..5782cb5391 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -63,7 +63,12 @@ static struct event *t_rpki_sync;
 #define RPKI_OUTPUT_STRING "Control rpki specific settings\n"
 
 struct cache {
-	enum { TCP, SSH } type;
+	enum {
+		TCP,
+#if defined(FOUND_SSH)
+		SSH
+#endif
+	} type;
 	struct tr_socket *tr_socket;
 	union {
 		struct tr_tcp_config *tcp_config;