From a52fff3061b919c77aa10624ddce3c425ee4683c Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 11 Mar 2023 10:53:52 +0200 Subject: [PATCH] Avoild name clash in on ldap_connect --- configure.ac | 2 +- pam_ldaphome/pam_ldaphome.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 12e5800..a6cf93e 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ(2.63) -AC_INIT(pam-modules, 2.5, bug-pam-modules@gnu.org.ua) +AC_INIT(pam-modules, 2.5.90, bug-pam-modules@gnu.org.ua) AC_CONFIG_SRCDIR(pam_fshadow/pam_fshadow.c) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/pam_ldaphome/pam_ldaphome.c b/pam_ldaphome/pam_ldaphome.c index 256716e..8067844 100644 --- a/pam_ldaphome/pam_ldaphome.c +++ b/pam_ldaphome/pam_ldaphome.c @@ -306,7 +306,7 @@ parse_ldap_uri(const char *uri) static void ldap_unbind(LDAP *ld); static LDAP * -ldap_connect(struct gray_env *env) +ldaphome_connect(struct gray_env *env) { int rc; char *ldapuri = NULL; @@ -1579,7 +1579,7 @@ import_public_key(pam_handle_t *pamh, struct passwd *pw, struct gray_env *env) if (!attr) attr = "sshPublicKey"; - ld = ldap_connect(env); + ld = ldaphome_connect(env); if (!ld) return PAM_SERVICE_ERR; if (ldap_bind(ld, env))