sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r21761: - Give more detail on LDAP client library failures (make it clear

Browse Source 
where the error is from)

- Make default error string more consistant

Andrew Bartlett
(This used to be commit 7f115579d2)
This commit is contained in:
Andrew Bartlett 2007-03-08 06:23:39 +00:00 committed by Gerald (Jerry) Carter
parent f80d21069b
commit 3370f2f2d7
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/ldb/common/ldb_modules.c
View File

@ -432,7 +432,7 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
}
if (!ldb_errstring(module->ldb)) {
/* Set a default error string, to place the blame somewhere */
ldb_asprintf_errstring(module->ldb, "error in module %s: %s", module->ops->name, ldb_strerror(ret));
ldb_asprintf_errstring(module->ldb, "error in module %s: %s (%d)", module->ops->name, ldb_strerror(ret), ret);
}
return ret;
}

14
source4/lib/ldb/ldb_ildap/ldb_ildap.c
View File

@ -123,10 +123,16 @@ failed:
*/
static int ildb_map_error(struct ildb_private *ildb, NTSTATUS status)
{
TALLOC_CTX *mem_ctx = talloc_new(ildb);
if (NT_STATUS_IS_OK(status)) {
return LDB_SUCCESS;
}
ldb_set_errstring(ildb->module->ldb, ldap_errstr(ildb->ldap, status));
if (!mem_ctx) {
ldb_oom(ildb->module->ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
ldb_set_errstring(ildb->module->ldb, ldap_errstr(ildb->ldap, mem_ctx, status));
talloc_free(mem_ctx);
if (NT_STATUS_IS_LDAP(status)) {
return NT_STATUS_LDAP_CODE(status);
}
@ -763,7 +769,7 @@ static int ildb_connect(struct ldb_context *ldb, const char *url,
status = ldap_connect(ildb->ldap, url);
if (!NT_STATUS_IS_OK(status)) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "Failed to connect to ldap URL '%s' - %s\n",
url, ldap_errstr(ildb->ldap, status));
url, ldap_errstr(ildb->ldap, module, status));
goto failed;
}
@ -783,14 +789,14 @@ static int ildb_connect(struct ldb_context *ldb, const char *url,
status = ldap_bind_simple(ildb->ldap, bind_dn, password);
if (!NT_STATUS_IS_OK(status)) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "Failed to bind - %s\n",
ldap_errstr(ildb->ldap, status));
ldap_errstr(ildb->ldap, module, status));
goto failed;
}
} else {
status = ldap_bind_sasl(ildb->ldap, creds);
if (!NT_STATUS_IS_OK(status)) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "Failed to bind - %s\n",
ldap_errstr(ildb->ldap, status));
ldap_errstr(ildb->ldap, module, status));
goto failed;
}
}

9
source4/libcli/ldap/ldap_client.c
View File

@ -562,6 +562,7 @@ struct ldap_request *ldap_request_send(struct ldap_connection *conn,
msg->messageid = req->messageid;
if (!ldap_encode(msg, &req->data, req)) {
status = NT_STATUS_INTERNAL_ERROR;
goto failed;
}
@ -704,12 +705,14 @@ NTSTATUS ldap_check_response(struct ldap_connection *conn, struct ldap_Result *r
/*
return error string representing the last error
*/
const char *ldap_errstr(struct ldap_connection *conn, NTSTATUS status)
const char *ldap_errstr(struct ldap_connection *conn,
TALLOC_CTX *mem_ctx,
NTSTATUS status)
{
if (NT_STATUS_IS_LDAP(status) && conn->last_error != NULL) {
return conn->last_error;
return talloc_strdup(mem_ctx, conn->last_error);
}
return nt_errstr(status);
return talloc_asprintf(mem_ctx, "LDAP client internal error: %s", nt_errstr(status));
}

2
source4/torture/ldap/common.c
View File

@ -86,7 +86,7 @@ NTSTATUS torture_ldap_connection2(TALLOC_CTX *mem_ctx, struct ldap_connection **
status = ldap_bind_simple(*conn, userdn, password);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed a simple ldap bind - %s\n", ldap_errstr(*conn, status));
printf("Failed a simple ldap bind - %s\n", ldap_errstr(*conn, mem_ctx, status));
}
return status;