Update upstream source from tag 'upstream/1.7.0'

Update to upstream version '1.7.0'
with Debian dir 0b3cd490884352e14273caeca2f05c6a525499fa

1 files changed, 60 insertions, 0 deletions

diff --git a/libpam_internal/pam_econf.c b/libpam_internal/pam_econf.c
new file mode 100644
index 00000000..b3b9874d
--- /dev/null
+++ b/libpam_internal/pam_econf.c
@@ -0,0 +1,60 @@
+/* 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 = ECONF_SUCCESS;
+    D(("Read configuration from directory %s and %s", etc_conf_dir, usr_conf_dir));
+
+#ifdef HAVE_ECONF_READCONFIG
+
+    char *parsing_dirs = NULL;
+    if (asprintf(&parsing_dirs, "PARSING_DIRS=%s:%s", usr_conf_dir, etc_conf_dir) < 0) {
+        ret = ECONF_NOMEM;
+        parsing_dirs = NULL;
+    }
+    if (ret == ECONF_SUCCESS)
+        ret = econf_newKeyFile_with_options(key_file, parsing_dirs);
+    if (ret == ECONF_SUCCESS)
+        ret = econf_readConfigWithCallback(key_file,
+					   NULL,
+					   usr_conf_dir,
+					   config_name,
+					   config_suffix,
+					   delim,
+					   comment,
+					   callback, callback_data);
+    free(parsing_dirs);
+
+#else
+
+    ret = econf_readDirsWithCallback(key_file,
+				     usr_conf_dir,
+				     etc_conf_dir,
+				     config_name,
+				     config_suffix,
+				     delim,
+				     comment,
+				     callback, callback_data);
+
+#endif
+
+    return ret;
+}
+
+#endif /* USE_ECONF */