43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
|
From 587b013d0b6f8a9411617b5faac2750d2e4b7a5d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Hrozek <jhrozek@redhat.com>
|
||
|
|
Date: Mon, 1 Aug 2011 15:22:53 +0200
|
||
|
|
Subject: Request password control unconditionally during bind
|
||
|
|
|
||
|
|
https://fedorahosted.org/sssd/ticket/940
|
||
|
|
|
||
|
|
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
|
||
|
|
index cab3657..9d543ec 100644
|
||
|
|
--- a/src/providers/ldap/sdap_async_connection.c
|
||
|
|
+++ b/src/providers/ldap/sdap_async_connection.c
|
||
|
|
@@ -437,10 +437,10 @@ static struct tevent_req *simple_bind_send(TALLOC_CTX *memctx,
|
||
|
|
state->user_dn = user_dn;
|
||
|
|
state->pw = pw;
|
||
|
|
|
||
|
|
- ret = sdap_control_create(state->sh, LDAP_CONTROL_PASSWORDPOLICYREQUEST,
|
||
|
|
- 0, NULL, 0, &ctrls[0]);
|
||
|
|
+ ret = sss_ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST,
|
||
|
|
+ 0, NULL, 0, &ctrls[0]);
|
||
|
|
if (ret != LDAP_SUCCESS && ret != LDAP_NOT_SUPPORTED) {
|
||
|
|
- DEBUG(1, ("sdap_control_create failed to create "
|
||
|
|
+ DEBUG(1, ("sss_ldap_control_create failed to create "
|
||
|
|
"Password Policy control.\n"));
|
||
|
|
goto fail;
|
||
|
|
}
|
||
|
|
@@ -1634,10 +1634,10 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request,
|
||
|
|
sasl_mech = dp_opt_get_string(p->opts->basic, SDAP_SASL_MECH);
|
||
|
|
|
||
|
|
if (sasl_mech == NULL) {
|
||
|
|
- ret = sdap_control_create(p->sh, LDAP_CONTROL_PASSWORDPOLICYREQUEST,
|
||
|
|
- 0, NULL, 0, &ctrls[0]);
|
||
|
|
+ ret = sss_ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST,
|
||
|
|
+ 0, NULL, 0, &ctrls[0]);
|
||
|
|
if (ret != LDAP_SUCCESS && ret != LDAP_NOT_SUPPORTED) {
|
||
|
|
- DEBUG(1, ("sdap_control_create failed to create "
|
||
|
|
+ DEBUG(1, ("sss_ldap_control_create failed to create "
|
||
|
|
"Password Policy control.\n"));
|
||
|
|
goto done;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.3.4
|
||
|
|
|