summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2011-08-01 15:22:53 +0200
committerStephen Gallagher <sgallagh@redhat.com>2011-08-04 09:54:05 -0400
commit47985a7b3a1a4c00b38350692197ce360e5e36ef (patch)
treeadf94a136ef332b86dfa15e6c993796e6050f814
parent6a6b58200ff6a2d929b6c2d9eabd70d26458533d (diff)
downloadsssd-47985a7b3a1a4c00b38350692197ce360e5e36ef.tar.gz
sssd-47985a7b3a1a4c00b38350692197ce360e5e36ef.tar.xz
sssd-47985a7b3a1a4c00b38350692197ce360e5e36ef.zip
Request password control unconditionally during bind
https://fedorahosted.org/sssd/ticket/940
-rw-r--r--src/providers/ldap/sdap_async_connection.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 4e6b8099d..e2a8426df 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -441,10 +441,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;
}
@@ -1631,10 +1631,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;
}