From 039393d6620816789b4ebd131974b23b6420f4dc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 17 Jul 2005 10:52:31 +0000
Subject: [PATCH] r8523: match a zero message id in ldap replies to the last
 request sent. Thanks to simo for noticing that this is needed to catch the
 server sending a "can't decode request" error reply (This used to be commit
 6e81e866dc7a5dc014d2d9f2e09803c6adfd1830)

---
 source4/libcli/ldap/ldap_client.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index a8463f78724..97b75602aaa 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -106,6 +106,11 @@ static void ldap_match_message(struct ldap_connection *conn, struct ldap_message
 	for (req=conn->pending; req; req=req->next) {
 		if (req->messageid == msg->messageid) break;
 	}
+	/* match a zero message id to the last request sent.
+	   It seems that servers send 0 if unable to parse */
+	if (req == NULL && msg->messageid == 0) {
+		req = conn->pending;
+	}
 	if (req == NULL) {
 		DEBUG(0,("ldap: no matching message id for %u\n",
 			 msg->messageid));
@@ -480,6 +485,9 @@ struct ldap_request *ldap_request_send(struct ldap_connection *conn,
 	req->state       = LDAP_REQUEST_SEND;
 	req->conn        = conn;
 	req->messageid   = conn->next_messageid++;
+	if (conn->next_messageid == 0) {
+		conn->next_messageid = 1;
+	}
 	req->type        = msg->type;
 	if (req->messageid == -1) {
 		goto failed;