From: Nick Porter Date: Thu, 22 Jun 2023 10:42:13 +0000 (+0100) Subject: Move tls_conf_parse_cache_mode outside of #ifdef __APPLE__ X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0688512bee6223db981cb64cffb32a07dd61f076;p=thirdparty%2Ffreeradius-server.git Move tls_conf_parse_cache_mode outside of #ifdef __APPLE__ --- diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c index c8a5178fd40..d16da1baa63 100644 --- a/src/lib/tls/conf.c +++ b/src/lib/tls/conf.c @@ -240,14 +240,6 @@ CONF_PARSER fr_tls_client_config[] = { CONF_PARSER_TERMINATOR }; -#ifdef __APPLE__ -/* - * We don't want to put the private key password in eap.conf, so check - * for our special string which indicates we should get the password - * programmatically. - */ -static char const *special_string = "Apple:UsecertAdmin"; - static int tls_conf_parse_cache_mode(TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, CONF_PARSER const *rule) { fr_tls_conf_t *conf = talloc_get_type_abort(parent, fr_tls_conf_t); @@ -351,6 +343,14 @@ static int tls_conf_parse_cache_mode(TALLOC_CTX *ctx, void *out, void *parent, C return 0; } +#ifdef __APPLE__ +/* + * We don't want to put the private key password in eap.conf, so check + * for our special string which indicates we should get the password + * programmatically. + */ +static char const *special_string = "Apple:UsecertAdmin"; + /** Use cert_admin to retrieve the password for the private key * */