From d5e1e30271d5173abf37d0028f82dab8ca052ba1 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 24 Aug 2020 21:58:59 -0400 Subject: Use configPath to load client cert/priv --- server.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/server.c b/server.c index 1c87c2a..89e3e36 100644 --- a/server.c +++ b/server.c @@ -57,13 +57,24 @@ void serverConfig(bool insecure, const char *cert, const char *priv) { } if (cert) { - error = tls_config_set_keypair_file(config, cert, (priv ? priv : cert)); - if (error) { - errx( - EX_SOFTWARE, "tls_config_set_keypair_file: %s", - tls_config_error(config) - ); + const char *dirs = NULL; + for (const char *path; NULL != (path = configPath(&dirs, cert));) { + if (priv) { + error = tls_config_set_cert_file(config, path); + } else { + error = tls_config_set_keypair_file(config, path, path); + } + if (!error) break; + } + if (error) errx(EX_NOINPUT, "%s: %s", cert, tls_config_error(config)); + } + if (priv) { + const char *dirs = NULL; + for (const char *path; NULL != (path = configPath(&dirs, priv));) { + error = tls_config_set_key_file(config, path); + if (!error) break; } + if (error) errx(EX_NOINPUT, "%s: %s", priv, tls_config_error(config)); } client = tls_client(); -- cgit 1.4.1 follow=1'>commit diff
path: root/pounce.1 (unfollow)
Commit message (Expand)Author
2019-10-26Add undocumented flag to disable verificationJune McEnroe
2019-10-26Do not require RPL_ISUPPORT for stateReadyJune McEnroe
2019-10-26Implement graceful shutdownJune McEnroe
2019-10-26Require PASS before USERJune McEnroe
2019-10-26Track channel topicsJune McEnroe
2019-10-26Set AWAY when no clients are connectedJune McEnroe
2019-10-26Add flags to request TOPIC and NAMES on client connectJune McEnroe
2019-10-26OopsJune McEnroe
2019-10-26Disconnect client on unknown commandJune McEnroe
2019-10-26Allow reading sensitive information from filesJune McEnroe
2019-10-26Add rc scriptJune McEnroe
2019-10-25Add install and uninstall targetsJune McEnroe
2019-10-25Expand documentationJune McEnroe
2019-10-25Add AGPLv3 notice on client registrationJune McEnroe
2019-10-25Rename project pounceJune McEnroe