libpam_internal: introduce pam_econf_readconfig

Use this new function instead of econf_readDirs() and
econf_readDirsWithCallback().

Co-authored-by: Dmitry V. Levin <ldv@strace.io>

1 files changed, 34 insertions, 0 deletions

diff --git a/libpam_internal/pam_econf.c b/libpam_internal/pam_econf.c
new file mode 100644
index 00000000..595c122a
--- /dev/null
+++ b/libpam_internal/pam_econf.c
@@ -0,0 +1,34 @@
+/* pam_econf.c -- routines to parse configuration files with libeconf */
+
+#include "config.h"
+
+#ifdef USE_ECONF
+
+#include <stdio.h>
+#include <security/_pam_macros.h>
+#include "pam_econf.h"
+
+econf_err pam_econf_readconfig(econf_file **key_file,
+			       const char *usr_conf_dir,
+			       const char *etc_conf_dir,
+			       const char *config_name,
+			       const char *config_suffix,
+			       const char *delim,
+			       const char *comment,
+			       bool (*callback)(const char *filename, const void *data),
+			       const void *callback_data)
+{
+    econf_err ret;
+    D(("Read configuration from directory %s and %s", etc_conf_dir, usr_conf_dir));
+    ret = econf_readDirsWithCallback(key_file,
+				     usr_conf_dir,
+				     etc_conf_dir,
+				     config_name,
+				     config_suffix,
+				     delim,
+				     comment,
+				     callback, callback_data);
+    return ret;
+}
+
+#endif /* USE_ECONF */