From 8b6e06e6c76e6d92e7eecea6b82c9f0c36cecbe6 Mon Sep 17 00:00:00 2001 From: yrutschle Date: Tue, 11 Aug 2020 17:37:23 +0200 Subject: [PATCH] support for libconfig 1.4.9. Fix #275 --- ChangeLog | 4 ++++ sslh-conf.c | 14 +++++++++++++- sslh-conf.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 205d7cd..d96fb39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +vNEXT: + Added symbol to support libconfig 1.4.9, still in + use in CentOS7. + v1.21: 11JUL2020 WARNING: Moved configuration and command-line management to diff --git a/sslh-conf.c b/sslh-conf.c index eb616ec..f421284 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Aug 4 16:36:09 2020. + * on Tue Aug 11 17:35:54 2020. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle @@ -48,6 +48,18 @@ /* This gets included in the output .c file */ +/* Libconfig 1.4.9 is still used by major distributions + * (e.g. CentOS7) and had a different name for + * config_setting_lookup */ +#if LIBCONFIG_VER_MAJOR == 1 +#if LIBCONFIG_VER_MINOR == 4 +#if LIBCONFIG_VER_REVISION == 9 +#define config_setting_lookup config_lookup_from +#endif +#endif +#endif + + /* config_type, lookup_fns, type2str are related, keep them together */ typedef enum { CFG_BOOL, diff --git a/sslh-conf.h b/sslh-conf.h index 9f48cf7..edc7f21 100644 --- a/sslh-conf.h +++ b/sslh-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Wed Jul 29 22:51:16 2020. + * on Tue Aug 11 17:35:54 2020. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle