From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 6 Nov 2025 11:22:38 +0000 (+0100)
Subject: BUILD: ssl/ckch: fix ckch_conf_kws parsing without ACME
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2F20251106-generate-keys;p=thirdparty%2Fhaproxy.git

BUILD: ssl/ckch: fix ckch_conf_kws parsing without ACME

Without ACME, the tmp_pkey and tmp_x509 functions are not available, the
patch checks HAVE_ACME to use them.
---

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 6bc4ebde7..57d456834 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -4733,7 +4733,7 @@ static int ckch_conf_load_pem_or_generate(void *value, char *buf, struct ckch_st
 {
 	char path[PATH_MAX];
 	int err_code = 0;
-	struct stat sb;
+	struct stat sb __maybe_unused;
 
 	if (cli)
 		return 0;
@@ -4741,6 +4741,7 @@ static int ckch_conf_load_pem_or_generate(void *value, char *buf, struct ckch_st
 	if (err_code & ERR_CODE)
 		goto out;
 
+#ifdef HAVE_ACME
 	errno = 0;
 	/* if ACME is enabled and the file does not exists, generate the PEM */
 	if (s->conf.acme.id && (stat(path, &sb) == -1 && errno == ENOENT)) {
@@ -4754,7 +4755,9 @@ static int ckch_conf_load_pem_or_generate(void *value, char *buf, struct ckch_st
 			goto out;
 		}
 
-	} else {
+	} else
+#endif
+	{
 		err_code |= ssl_sock_load_pem_into_ckch(path, buf, s->data, err);
 	}
 out:
@@ -4764,7 +4767,7 @@ static int ckch_conf_load_key_or_generate(void *value, char *buf, struct ckch_st
 {
 	char path[PATH_MAX];
 	int err_code = 0;
-	struct stat sb;
+	struct stat sb __maybe_unused;
 
 	if (cli)
 		return 0;
@@ -4772,13 +4775,16 @@ static int ckch_conf_load_key_or_generate(void *value, char *buf, struct ckch_st
 	if (err_code & ERR_CODE)
 		goto out;
 
+#ifdef HAVE_ACME
 	errno = 0;
 	/* if ACME is enabled and the file does not exists, and no key was previously loaded generate the key */
 	if (s->conf.acme.id &&
 	    (stat(path, &sb) == -1 && errno == ENOENT) &&
 	    (!s->data->key)) {
 		s->data->key = acme_gen_tmp_pkey();
-	} else {
+	} else
+#endif
+	{
 		err_code |= ssl_sock_load_key_into_ckch(path, buf, s->data, err);
 	}
 out: