From bc461898448a1bf306fc094cdf6a5a197c4e2753 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 27 Jun 2024 16:06:36 +0200 Subject: libpam_internal: introduce pam_econf_readconfig Use this new function instead of econf_readDirs() and econf_readDirsWithCallback(). Co-authored-by: Dmitry V. Levin --- libpam/pam_modutil_searchkey.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libpam') diff --git a/libpam/pam_modutil_searchkey.c b/libpam/pam_modutil_searchkey.c index 5480db1d..ccf2461f 100644 --- a/libpam/pam_modutil_searchkey.c +++ b/libpam/pam_modutil_searchkey.c @@ -14,7 +14,7 @@ #include #include #ifdef USE_ECONF -#include +#include "pam_econf.h" #endif #ifdef USE_ECONF @@ -29,10 +29,14 @@ econf_search_key (const char *name, const char *suffix, const char *key) { econf_file *key_file = NULL; char *val; + econf_err error; - if (econf_readDirs (&key_file, VENDORDIR, SYSCONFDIR, name, suffix, - " \t", "#")) - return NULL; + error = pam_econf_readconfig (&key_file, VENDORDIR, SYSCONFDIR, name, suffix, + " \t", "#", NULL, NULL); + if (error != ECONF_SUCCESS) { + econf_free (key_file); + return NULL; + } if (econf_getStringValue (key_file, NULL, key, &val)) { econf_free (key_file); -- cgit v1.2.3