summaryrefslogtreecommitdiff
path: root/libcli/ldap
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-04-23 15:12:35 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-04-23 15:12:35 +0200
commit53d491c9a4011a7d9ad69db52fb91d163f3f990a (patch)
tree9d0ed3130f35142da50c2e20e8addfe8909f459f /libcli/ldap
parentaf6298a84dffb400551861c6dc34591f1473830c (diff)
parent1722859abd169f2949b5822f97c810f2b8d162da (diff)
downloadsamba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.gz
samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.bz2
samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'libcli/ldap')
-rw-r--r--libcli/ldap/ldap_message.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcli/ldap/ldap_message.c b/libcli/ldap/ldap_message.c
index 9b00d0188d..8b0f8a2ea1 100644
--- a/libcli/ldap/ldap_message.c
+++ b/libcli/ldap/ldap_message.c
@@ -1230,8 +1230,8 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data,
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_enumerated(data, (int *)(void *)&(r->scope));
+ asn1_read_enumerated(data, (int *)(void *)&(r->deref));
asn1_read_Integer(data, &sizelimit);
r->sizelimit = sizelimit;
asn1_read_Integer(data, &timelimit);