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>

3 files changed, 61 insertions, 3 deletions

diff --git a/libpam_internal/Makefile.am b/libpam_internal/Makefile.am
index 1078cf0f..b368ebc8 100644
--- a/libpam_internal/Makefile.am
+++ b/libpam_internal/Makefile.am
@@ -1,10 +1,12 @@
 noinst_LTLIBRARIES = libpam_internal.la
 
-noinst_HEADERS = include/pam_line.h
+noinst_HEADERS = include/pam_line.h include/pam_econf.h
 
 AM_CFLAGS = -I$(top_srcdir)/libpam_internal/include \
-	    -I$(top_srcdir)/libpam/include $(WARN_CFLAGS)
+	    -I$(top_srcdir)/libpam/include $(WARN_CFLAGS) \
+	    $(ECONF_CFLAGS)
 
 libpam_internal_la_SOURCES = \
 	pam_debug.c \
-	pam_line.c
+	pam_line.c \
+	pam_econf.c
diff --git a/libpam_internal/include/pam_econf.h b/libpam_internal/include/pam_econf.h
new file mode 100644
index 00000000..ebba659d
--- /dev/null
+++ b/libpam_internal/include/pam_econf.h
@@ -0,0 +1,22 @@
+/* pam_econf.h -- routines to parse configuration files with libeconf */
+
+#ifndef PAM_ECONF_H
+#define PAM_ECONF_H
+
+#ifdef USE_ECONF
+
+#include <libeconf.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);
+
+#endif /* USE_ECONF */
+
+#endif /* PAM_ECONF_H */
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 */