svn commit: samba r11271 - in branches/SAMBA_4_0/source/libcli/ldap: .

vlendec at samba.org vlendec at samba.org
Mon Oct 24 04:19:28 GMT 2005


Author: vlendec
Date: 2005-10-24 04:19:27 +0000 (Mon, 24 Oct 2005)
New Revision: 11271

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11271

Log:
Fix a warning and an infinite recursion
Modified:
   branches/SAMBA_4_0/source/libcli/ldap/ldap_ildap.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_ildap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_ildap.c	2005-10-23 22:20:42 UTC (rev 11270)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_ildap.c	2005-10-24 04:19:27 UTC (rev 11271)
@@ -180,7 +180,7 @@
 	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 @@
 {
 	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;
 }



More information about the samba-cvs mailing list