summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-10-24 04:19:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:11 -0500
commitca40d0a6fea0dbf2a9962ed125f420bea3ca0269 (patch)
treedc43b8238c879eb8bd8679be21b3b786585ae67b
parentdb4b95827e4e6d13577513946bff4f956c849756 (diff)
downloadsamba-ca40d0a6fea0dbf2a9962ed125f420bea3ca0269.tar.gz
samba-ca40d0a6fea0dbf2a9962ed125f420bea3ca0269.tar.bz2
samba-ca40d0a6fea0dbf2a9962ed125f420bea3ca0269.zip
r11271: Fix a warning and an infinite recursion
(This used to be commit 7bc855359a82010fefa9fd1d4c719292bfc83528)
-rw-r--r--source4/libcli/ldap/ldap_ildap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/ldap/ldap_ildap.c b/source4/libcli/ldap/ldap_ildap.c
index d85585bce8..666cc02536 100644
--- a/source4/libcli/ldap/ldap_ildap.c
+++ b/source4/libcli/ldap/ldap_ildap.c
@@ -180,7 +180,7 @@ NTSTATUS ildap_search_bytree(struct ldap_connection *conn, const char *basedn,
msg->r.SearchRequest.attributesonly = attributesonly;
msg->r.SearchRequest.tree = tree;
msg->r.SearchRequest.num_attributes = n;
- msg->r.SearchRequest.attributes = attrs;
+ msg->r.SearchRequest.attributes = discard_const(attrs);
req = ldap_request_send(conn, msg);
talloc_steal(msg, req);
@@ -224,7 +224,8 @@ NTSTATUS ildap_search(struct ldap_connection *conn, const char *basedn,
{
struct ldb_parse_tree *tree = ldb_parse_tree(conn, expression);
NTSTATUS status;
- status = ildap_search(conn, basedn, scope, tree, attrs, attributesonly, results);
+ status = ildap_search_bytree(conn, basedn, scope, tree, attrs,
+ attributesonly, results);
talloc_free(tree);
return status;
}