diff options
| author | June McEnroe <june@causal.agency> | 2021-10-05 23:16:32 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-10-05 23:30:09 -0400 |
| commit | fa944345a63a083555a1f1933aabf4ea6f27a307 (patch) | |
| tree | 37a053122b20d4c306013911cb022b000cecf0b6 /server.c | |
| parent | Load and reload local certificates like normal (diff) | |
| download | pounce-fa944345a63a083555a1f1933aabf4ea6f27a307.tar.gz pounce-fa944345a63a083555a1f1933aabf4ea6f27a307.zip | |
Refactor XDG base directory iterator API
Finally something more reasonable for call sites.
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server.c b/server.c index 552f521..0c6bccc 100644 --- a/server.c +++ b/server.c @@ -27,6 +27,7 @@ #include <assert.h> #include <err.h> +#include <limits.h> #include <netdb.h> #include <netinet/in.h> #include <stdarg.h> @@ -47,6 +48,7 @@ void serverConfig( bool insecure, const char *trust, const char *cert, const char *priv ) { int error = 0; + char buf[PATH_MAX]; config = tls_config_new(); if (!config) errx(EX_SOFTWARE, "tls_config_new"); @@ -54,32 +56,30 @@ void serverConfig( tls_config_insecure_noverifycert(config); tls_config_insecure_noverifyname(config); } + if (trust) { tls_config_insecure_noverifyname(config); - const char *dirs = NULL; - for (const char *path; NULL != (path = configPath(&dirs, trust));) { - error = tls_config_set_ca_file(config, path); + for (int i = 0; configPath(buf, sizeof(buf), trust, i); ++i) { + error = tls_config_set_ca_file(config, buf); if (!error) break; } if (error) errx(EX_NOINPUT, "%s: %s", trust, tls_config_error(config)); } if (cert) { - const char *dirs = NULL; - for (const char *path; NULL != (path = configPath(&dirs, cert));) { + for (int i = 0; configPath(buf, sizeof(buf), cert, i); ++i) { if (priv) { - error = tls_config_set_cert_file(config, path); + error = tls_config_set_cert_file(config, buf); } else { - error = tls_config_set_keypair_file(config, path, path); + error = tls_config_set_keypair_file(config, buf, buf); } 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); + for (int i = 0; configPath(buf, sizeof(buf), priv, i); ++i) { + error = tls_config_set_key_file(config, buf); if (!error) break; } if (error) errx(EX_NOINPUT, "%s: %s", priv, tls_config_error(config)); |