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

  where the error is from)

- Make default error string more consistant

Andrew Bartlett
(This used to be commit 7f115579d20a3112efd11444fafcbf78698fc9a1)

1 files changed, 6 insertions, 3 deletions

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 2c2cd0dd66..82cafd721a 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -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));
 }