From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 7 Feb 2023 22:25:37 +0000 (+0200)
Subject: lib-master: Add master_service_settings_find()
X-Git-Tag: 2.4.0~2257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47398537bdcc9214371ecbe5bed484cb5b53241c;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Add master_service_settings_find()
---

diff --git a/src/lib-lua/Makefile.am b/src/lib-lua/Makefile.am
index 23a449c9c0..64b862b1eb 100644
--- a/src/lib-lua/Makefile.am
+++ b/src/lib-lua/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-dns \
 	-I$(top_srcdir)/src/lib-http \
 	-I$(top_srcdir)/src/lib-ssl-iostream \
+	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master \
 	$(LUA_CFLAGS)
 
diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 179b1913a6..67068b822b 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -974,6 +974,13 @@ int master_service_set(struct setting_parser_context *set_parser,
 	return ret;
 }
 
+const void *
+master_service_settings_find(struct setting_parser_context *set_parser,
+			     const char *key, enum setting_type *type_r)
+{
+	return settings_parse_get_value(set_parser, key, type_r);
+}
+
 bool master_service_set_has_config_override(struct master_service *service,
 					    const char *key)
 {
diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index 7843bf9fb0..c8bc0878cd 100644
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -2,11 +2,10 @@
 #define MASTER_SERVICE_SETTINGS_H
 
 #include "net.h"
+#include "settings-parser.h"
 
 struct var_expand_table;
 struct var_expand_func_table;
-struct setting_parser_info;
-struct setting_parser_context;
 struct master_service;
 struct master_settings_mmap;
 
@@ -196,6 +195,10 @@ master_service_settings_get_or_fatal(struct event *event,
 int master_service_set(struct setting_parser_context *set_parser,
 		       const char *key, const char *value,
 		       const char **error_r);
+/* Wrapper to settings_parse_get_value(). */
+const void *
+master_service_settings_find(struct setting_parser_context *set_parser,
+			     const char *key, enum setting_type *type_r);
 
 /* Returns TRUE if -o key=value parameter was used. Setting keys in overrides
    and parameter are unaliased before comparing. */
diff --git a/src/lib-storage/index/raw/Makefile.am b/src/lib-storage/index/raw/Makefile.am
index 368e8e9839..903326f43b 100644
--- a/src/lib-storage/index/raw/Makefile.am
+++ b/src/lib-storage/index/raw/Makefile.am
@@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libstorage_raw.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-imap \