diff options
Diffstat (limited to 'src/providers/ldap/sdap_async_connection.c')
| -rw-r--r-- | src/providers/ldap/sdap_async_connection.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c index c02307814..5ce0bb4b5 100644 --- a/src/providers/ldap/sdap_async_connection.c +++ b/src/providers/ldap/sdap_async_connection.c @@ -29,8 +29,6 @@ #include "providers/ldap/sdap_async_private.h" #include "providers/ldap/ldap_common.h" -#define LDAP_X_SSSD_PASSWORD_EXPIRED 0x555D - errno_t deref_string_to_val(const char *str, int *val) { if (strcasecmp(str, "never") == 0) { @@ -283,14 +281,14 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) (void*)&errmsg); if (optret == LDAP_SUCCESS) { DEBUG(3, ("ldap_start_tls failed: [%s] [%s]\n", - ldap_err2string(lret), + sss_ldap_err2string(lret), errmsg)); sss_log(SSS_LOG_ERR, "Could not start TLS. %s", errmsg); ldap_memfree(errmsg); } else { DEBUG(3, ("ldap_start_tls failed: [%s]\n", - ldap_err2string(lret))); + sss_ldap_err2string(lret))); sss_log(SSS_LOG_ERR, "Could not start TLS. " "Check for certificate issues."); } @@ -351,7 +349,7 @@ static void sdap_connect_done(struct sdap_op *op, } DEBUG(3, ("START TLS result: %s(%d), %s\n", - ldap_err2string(state->result), state->result, errmsg)); + sss_ldap_err2string(state->result), state->result, errmsg)); ldap_memfree(errmsg); if (ldap_tls_inplace(state->sh->ldap)) { @@ -369,14 +367,14 @@ static void sdap_connect_done(struct sdap_op *op, (void*)&tlserr); if (optret == LDAP_SUCCESS) { DEBUG(3, ("ldap_install_tls failed: [%s] [%s]\n", - ldap_err2string(ret), + sss_ldap_err2string(ret), tlserr)); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. %s", tlserr); ldap_memfree(tlserr); } else { DEBUG(3, ("ldap_install_tls failed: [%s]\n", - ldap_err2string(ret))); + sss_ldap_err2string(ret))); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. " "Check for certificate issues."); } @@ -474,7 +472,7 @@ static struct tevent_req *simple_bind_send(TALLOC_CTX *memctx, ret = LDAP_LOCAL_ERROR; } else { DEBUG(1, ("ldap_bind failed (%d)[%s]\n", - ldap_err, ldap_err2string(ldap_err))); + ldap_err, sss_ldap_err2string(ldap_err))); ret = ldap_err; } goto fail; @@ -590,7 +588,7 @@ static void simple_bind_done(struct sdap_op *op, } DEBUG(3, ("Bind result: %s(%d), %s\n", - ldap_err2string(state->result), state->result, errmsg)); + sss_ldap_err2string(state->result), state->result, errmsg)); ret = LDAP_SUCCESS; done: @@ -669,7 +667,7 @@ static struct tevent_req *sasl_bind_send(TALLOC_CTX *memctx, state->result = ret; if (ret != LDAP_SUCCESS) { DEBUG(1, ("ldap_sasl_bind failed (%d)[%s]\n", - ret, ldap_err2string(ret))); + ret, sss_ldap_err2string(ret))); goto fail; } @@ -1554,11 +1552,11 @@ static int synchronous_tls_setup(LDAP *ldap) optret = ldap_get_option(ldap, SDAP_DIAGNOSTIC_MESSAGE, (void*)&errmsg); if (optret == LDAP_SUCCESS) { DEBUG(3, ("ldap_start_tls failed: [%s] [%s]\n", - ldap_err2string(lret), errmsg)); + sss_ldap_err2string(lret), errmsg)); sss_log(SSS_LOG_ERR, "Could not start TLS. %s", errmsg); ldap_memfree(errmsg); } else { - DEBUG(3, ("ldap_start_tls failed: [%s]\n", ldap_err2string(lret))); + DEBUG(3, ("ldap_start_tls failed: [%s]\n", sss_ldap_err2string(lret))); sss_log(SSS_LOG_ERR, "Could not start TLS. " "Check for certificate issues."); } @@ -1576,12 +1574,12 @@ static int synchronous_tls_setup(LDAP *ldap) 0); if (lret != LDAP_SUCCESS) { DEBUG(2, ("ldap_parse_result failed (%d) [%d][%s]\n", msgid, lret, - ldap_err2string(lret))); + sss_ldap_err2string(lret))); return lret; } DEBUG(3, ("START TLS result: %s(%d), %s\n", - ldap_err2string(ldaperr), ldaperr, errmsg)); + sss_ldap_err2string(ldaperr), ldaperr, errmsg)); ldap_memfree(errmsg); if (ldap_tls_inplace(ldap)) { @@ -1595,12 +1593,12 @@ static int synchronous_tls_setup(LDAP *ldap) optret = ldap_get_option(ldap, SDAP_DIAGNOSTIC_MESSAGE, (void*)&errmsg); if (optret == LDAP_SUCCESS) { DEBUG(3, ("ldap_install_tls failed: [%s] [%s]\n", - ldap_err2string(lret), errmsg)); + sss_ldap_err2string(lret), errmsg)); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. %s", errmsg); ldap_memfree(errmsg); } else { DEBUG(3, ("ldap_install_tls failed: [%s]\n", - ldap_err2string(lret))); + sss_ldap_err2string(lret))); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. " "Check for certificate issues."); } @@ -1670,7 +1668,7 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, request_controls, NULL, NULL); if (ret != LDAP_SUCCESS) { DEBUG(1, ("ldap_sasl_bind_s failed (%d)[%s]\n", ret, - ldap_err2string(ret))); + sss_ldap_err2string(ret))); } } else { sasl_bind_state = talloc_zero(tmp_ctx, struct sasl_bind_state); @@ -1688,7 +1686,7 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, sasl_bind_state); if (ret != LDAP_SUCCESS) { DEBUG(1, ("ldap_sasl_interactive_bind_s failed (%d)[%s]\n", ret, - ldap_err2string(ret))); + sss_ldap_err2string(ret))); } } |