diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-02-24 12:29:59 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2009-02-24 17:55:40 +0100 |
commit | 7aaec963c1764869b042240fb5b5d6a339ee052b (patch) | |
tree | 1d8aebf0ca97da66701604b58685075c8ae12a4d /libcli/ldap/ldap_message.c | |
parent | ef0fa403f1c5d670b7991770e7fbb8394879de4b (diff) | |
download | samba-7aaec963c1764869b042240fb5b5d6a339ee052b.tar.gz samba-7aaec963c1764869b042240fb5b5d6a339ee052b.tar.bz2 samba-7aaec963c1764869b042240fb5b5d6a339ee052b.zip |
libcli/ldap: fix compiler warnings
metze
Diffstat (limited to 'libcli/ldap/ldap_message.c')
-rw-r--r-- | libcli/ldap/ldap_message.c | 15 |
1 files changed, 10 insertions, 5 deletions
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); |