From 7aaec963c1764869b042240fb5b5d6a339ee052b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 24 Feb 2009 12:29:59 +0100
Subject: libcli/ldap: fix compiler warnings

metze
---
 libcli/ldap/ldap_message.c | 15 ++++++++++-----
 libcli/ldap/ldap_message.h |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'libcli')

diff --git a/libcli/ldap/ldap_message.c b/libcli/ldap/ldap_message.c
index e8ec716e64..06052a936a 100644
--- a/libcli/ldap/ldap_message.c
+++ b/libcli/ldap/ldap_message.c
@@ -923,13 +923,13 @@ static struct ldb_parse_tree *ldap_decode_filter_tree(TALLOC_CTX *mem_ctx,
 				ret->u.extended.attr = talloc_strdup(ret, "*");
 			}
 			ret->u.extended.rule_id      = talloc_steal(ret, oid);
-			ret->u.extended.value.data   = talloc_steal(ret, value);
+			ret->u.extended.value.data   = (uint8_t *)talloc_steal(ret, value);
 			ret->u.extended.value.length = strlen(value);
 			ret->u.extended.dnAttributes = dnAttributes;
 		} else {
 			ret->operation               = LDB_OP_EQUALITY;
 			ret->u.equality.attr         = talloc_steal(ret, attr);
-			ret->u.equality.value.data   = talloc_steal(ret, value);
+			ret->u.equality.value.data   = (uint8_t *)talloc_steal(ret, value);
 			ret->u.equality.value.length = strlen(value);
 		}
 		if (!asn1_end_tag(data)) {
@@ -1087,13 +1087,17 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data, struct ldap_message *msg)
 
 	case ASN1_APPLICATION(LDAP_TAG_SearchRequest): {
 		struct ldap_SearchRequest *r = &msg->r.SearchRequest;
+		int sizelimit, timelimit;
+		const char **attrs = NULL;
 		msg->type = LDAP_TAG_SearchRequest;
 		asn1_start_tag(data, tag);
 		asn1_read_OctetString_talloc(msg, data, &r->basedn);
 		asn1_read_enumerated(data, (int *)&(r->scope));
 		asn1_read_enumerated(data, (int *)&(r->deref));
-		asn1_read_Integer(data, &r->sizelimit);
-		asn1_read_Integer(data, &r->timelimit);
+		asn1_read_Integer(data, &sizelimit);
+		r->sizelimit = sizelimit;
+		asn1_read_Integer(data, &timelimit);
+		r->timelimit = timelimit;
 		asn1_read_BOOLEAN(data, &r->attributesonly);
 
 		r->tree = ldap_decode_filter_tree(msg, data);
@@ -1113,10 +1117,11 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data, struct ldap_message *msg)
 							  &attr))
 				return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
 			if (!add_string_to_array(msg, attr,
-						 &r->attributes,
+						 &attrs,
 						 &r->num_attributes))
 				return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
 		}
+		r->attributes = attrs;
 
 		asn1_end_tag(data);
 		asn1_end_tag(data);
diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h
index 672de0d925..d2ce14445d 100644
--- a/libcli/ldap/ldap_message.h
+++ b/libcli/ldap/ldap_message.h
@@ -160,7 +160,7 @@ struct ldap_CompareRequest {
 };
 
 struct ldap_AbandonRequest {
-	uint32_t messageid;
+	int messageid;
 };
 
 struct ldap_ExtendedRequest {
-- 
cgit