mirror of
git://git.gnu.org.ua/pam-modules.git
synced 2025-04-26 00:19:52 +03:00
Avoild name clash in on ldap_connect
This commit is contained in:
parent
60a5639981
commit
a52fff3061
2 changed files with 3 additions and 3 deletions
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
AC_PREREQ(2.63)
|
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_SRCDIR(pam_fshadow/pam_fshadow.c)
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
|
@ -306,7 +306,7 @@ parse_ldap_uri(const char *uri)
|
||||||
static void ldap_unbind(LDAP *ld);
|
static void ldap_unbind(LDAP *ld);
|
||||||
|
|
||||||
static LDAP *
|
static LDAP *
|
||||||
ldap_connect(struct gray_env *env)
|
ldaphome_connect(struct gray_env *env)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
char *ldapuri = NULL;
|
char *ldapuri = NULL;
|
||||||
|
@ -1579,7 +1579,7 @@ import_public_key(pam_handle_t *pamh, struct passwd *pw, struct gray_env *env)
|
||||||
if (!attr)
|
if (!attr)
|
||||||
attr = "sshPublicKey";
|
attr = "sshPublicKey";
|
||||||
|
|
||||||
ld = ldap_connect(env);
|
ld = ldaphome_connect(env);
|
||||||
if (!ld)
|
if (!ld)
|
||||||
return PAM_SERVICE_ERR;
|
return PAM_SERVICE_ERR;
|
||||||
if (ldap_bind(ld, env))
|
if (ldap_bind(ld, env))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue