mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-09 03:47:47 +00:00
Merge pull request #4277 from rtrlib/2019-05-07-master-bugfix
RPKI fixes/improvements
This commit is contained in:
commit
be54c185f9
@ -1112,7 +1112,7 @@ DEFPY (rpki_cache,
|
|||||||
vty_out(vty,
|
vty_out(vty,
|
||||||
"ssh sockets are not supported. "
|
"ssh sockets are not supported. "
|
||||||
"Please recompile rtrlib and frr with ssh support. "
|
"Please recompile rtrlib and frr with ssh support. "
|
||||||
"If you want to use it");
|
"If you want to use it\n");
|
||||||
#endif
|
#endif
|
||||||
} else { // use tcp connection
|
} else { // use tcp connection
|
||||||
return_value = add_tcp_cache(cache, tcpport, preference);
|
return_value = add_tcp_cache(cache, tcpport, preference);
|
||||||
@ -1253,6 +1253,7 @@ DEFUN (show_rpki_cache_server,
|
|||||||
cache->tr_config.tcp_config->host,
|
cache->tr_config.tcp_config->host,
|
||||||
cache->tr_config.tcp_config->port);
|
cache->tr_config.tcp_config->port);
|
||||||
|
|
||||||
|
#if defined(FOUND_SSH)
|
||||||
} else if (cache->type == SSH) {
|
} else if (cache->type == SSH) {
|
||||||
vty_out(vty,
|
vty_out(vty,
|
||||||
"host: %s port: %d username: %s "
|
"host: %s port: %d username: %s "
|
||||||
@ -1264,6 +1265,7 @@ DEFUN (show_rpki_cache_server,
|
|||||||
->server_hostkey_path,
|
->server_hostkey_path,
|
||||||
cache->tr_config.ssh_config
|
cache->tr_config.ssh_config
|
||||||
->client_privkey_path);
|
->client_privkey_path);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user