svn commit: samba r11263 - in branches/SAMBA_4_0/source/winbind: .

2005-10-23 Thread vlendec
Author: vlendec
Date: 2005-10-23 11:21:15 + (Sun, 23 Oct 2005)
New Revision: 11263

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

Log:
Some cleanup
Modified:
   branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c


Changeset:
Sorry, the patch is too large (261 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11263


svn commit: samba r11264 - in branches/SAMBA_4_0/source/libcli/smb_composite: .

2005-10-23 Thread vlendec
Author: vlendec
Date: 2005-10-23 11:23:55 + (Sun, 23 Oct 2005)
New Revision: 11264

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

Log:
Winbind does not rely on the hostname resolution mechanisms of
composite_connect, so in io.in.dest_host I'm setting the IP address. Gensec
does not like that as a target hostname, so if a called name is present, use
that. So we can session setup using kerberos now.

Volker


Modified:
   branches/SAMBA_4_0/source/libcli/smb_composite/connect.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb_composite/connect.c
===
--- branches/SAMBA_4_0/source/libcli/smb_composite/connect.c2005-10-23 
11:21:15 UTC (rev 11263)
+++ branches/SAMBA_4_0/source/libcli/smb_composite/connect.c2005-10-23 
11:23:55 UTC (rev 11264)
@@ -355,7 +355,11 @@
 
conn->in.hostnames = talloc_array(state->conn, const char *, 1);
NT_STATUS_HAVE_NO_MEMORY(conn->in.hostnames);
-   conn->in.hostnames[0] = state->io->in.dest_host;
+   if (state->io->in.called_name != NULL) {
+   conn->in.hostnames[0] = state->io->in.called_name;
+   } else {
+   conn->in.hostnames[0] = state->io->in.dest_host;
+   }

conn->in.ports = NULL;
if (state->io->in.port != 0) {



svn commit: samba-web r838 - in trunk/devel: .

2005-10-23 Thread deryck
Author: deryck
Date: 2005-10-23 12:46:35 + (Sun, 23 Oct 2005)
New Revision: 838

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

Log:
Language change from"ask" to "require" based on 
suggestion from Dan Shearer.

deryck

Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===
--- trunk/devel/index.html  2005-10-20 17:13:05 UTC (rev 837)
+++ trunk/devel/index.html  2005-10-23 12:46:35 UTC (rev 838)
@@ -8,7 +8,7 @@
 
 Very often, questions arise concerning future plans for Samba.  For 
example:  "What functionality will be included in the next stable release?"  
"What are the differences between the various CVS and Subversion code 
branches?" And also, "How can I learn more, get involved, help, etc?"  The 
information on this page is provided to help answer those kinds of 
questions.
 
-Important: In order to avoid any potential licensing issues 
we also ask that anyone who has signed the http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cifs/protocol/royalty-free_cifs_technical_reference_license_agreement.asp";>Microsoft
 CIFS Royalty Free Agreement not submit patches to Samba, nor base patches 
on the referenced specification.  We ask, too, that patches submitted to Samba 
not infringe on any known patents.  Finally, as with all GPL work, the 
submitter should ensure that submitted patches do not conflict with any 
third-party copyright.
+Important: In order to avoid any potential licensing issues 
we require that anyone who has signed the http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cifs/protocol/royalty-free_cifs_technical_reference_license_agreement.asp";>Microsoft
 CIFS Royalty Free Agreement not submit patches to Samba, nor base patches 
on the referenced specification.  We require, too, that patches submitted to 
Samba not infringe on any known patents.  Finally, as with all GPL work, the 
submitter should ensure that submitted patches do not conflict with any 
third-party copyright.
 
 General Overview
 



svn commit: samba-web r839 - in trunk/support: .

2005-10-23 Thread deryck
Author: deryck
Date: 2005-10-23 12:49:03 + (Sun, 23 Oct 2005)
New Revision: 839

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

Log:

Update phone number for support provider.

deryck

Modified:
   trunk/support/us.html


Changeset:
Modified: trunk/support/us.html
===
--- trunk/support/us.html   2005-10-23 12:46:35 UTC (rev 838)
+++ trunk/support/us.html   2005-10-23 12:49:03 UTC (rev 839)
@@ -336,7 +336,7 @@
 Los Angeles, CA, 90025
 mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]
 http://www.skyyconsulting.com";>http://www.skyyconsulting.com
-310.706.9875
+310.622.7076
 
 Skyy Consulting is a premier provider of open source solutions for business. 
 With a full development team in house, Skyy can deliver customized solutions 



svn commit: samba r11265 - in branches/SAMBA_4_0/source/torture/nbt: .

2005-10-23 Thread metze
Author: metze
Date: 2005-10-23 14:18:03 + (Sun, 23 Oct 2005)
New Revision: 11265

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

Log:
add a bunch of owned vs. replica conflict tests

metze
Modified:
   branches/SAMBA_4_0/source/torture/nbt/winsreplication.c


Changeset:
Sorry, the patch is too large (1460 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11265


svn commit: samba r11266 - branches/SAMBA_3_0/source/param trunk/source/param

2005-10-23 Thread vlendec
Author: vlendec
Date: 2005-10-23 16:29:02 + (Sun, 23 Oct 2005)
New Revision: 11266

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

Log:
Speed up loading smb.conf for large numbers of share definitions. The problem
was a O(n^2) loop: Whenever a service definition was found, we linearly
searched the already loaded share definitions, the patch adds an internal tdb
for this. For a smb.conf with 2000 shares this speeds up loading by about a
factor of 50.

Might be a fix for bug #1117.

Thanks to Michael Adam <[EMAIL PROTECTED]>,

Volker

Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   trunk/source/param/loadparm.c


Changeset:
Sorry, the patch is too large (465 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11266


svn commit: samba r11267 - in branches/SAMBA_4_0/source/winbind: .

2005-10-23 Thread vlendec
Author: vlendec
Date: 2005-10-23 17:22:00 + (Sun, 23 Oct 2005)
New Revision: 11267

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

Log:
Fix a memleak and an uninitialized variable. Andrew Bartlett, this was the one
I sent to you. Sorry for bothering you.

Volker

Modified:
   branches/SAMBA_4_0/source/winbind/wb_pam_auth.c


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/wb_pam_auth.c
===
--- branches/SAMBA_4_0/source/winbind/wb_pam_auth.c 2005-10-23 16:29:02 UTC 
(rev 11266)
+++ branches/SAMBA_4_0/source/winbind/wb_pam_auth.c 2005-10-23 17:22:00 UTC 
(rev 11267)
@@ -129,6 +129,8 @@
state, "%s", dcerpc_server_name(domain->netlogon_pipe));
if (state->r.in.server_name == NULL) return NULL;
 
+   ZERO_STRUCT(state->auth2);
+
state->r.in.workstation =
cli_credentials_get_workstation(domain->schannel_creds);
state->r.in.credential = &state->auth;
@@ -208,17 +210,16 @@
   struct netr_UserSessionKey *user_session_key,
   struct netr_LMSessionKey *lm_key)
 {
+   struct pam_auth_crap_state *state =
+   talloc_get_type(c->private_data, struct pam_auth_crap_state);
NTSTATUS status = composite_wait(c);
if (NT_STATUS_IS_OK(status)) {
-   struct pam_auth_crap_state *state =
-   talloc_get_type(c->private_data,
-   struct pam_auth_crap_state);
info3->length = state->info3.length;
info3->data = talloc_steal(mem_ctx, state->info3.data);
*user_session_key = state->user_session_key;
*lm_key = state->lm_key;
}
-   talloc_free(c);
+   talloc_free(state);
return status;
 }
 



Re: svn commit: samba r11233 - in branches/SAMBA_3_0/source/smbd: .

2005-10-23 Thread Jeremy Allison
On Sun, Oct 23, 2005 at 04:15:57PM +1000, James Peach wrote:
> On Thu, 2005-10-20 at 18:15 +, [EMAIL PROTECTED] wrote:
> > Author: jra
> > Date: 2005-10-20 18:15:44 + (Thu, 20 Oct 2005)
> > New Revision: 11233
> > 
> > WebSVN: 
> > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11233
> > 
> > Log:
> > Forgot to add the statvfs file. Oops.
> 
> Should this be merged with the statfs/statvfs calls in fs_usage()?

Maybe - it was a point patch from ab - there was something
missing from the POSIX point of view for Linux clients. I'll
take a look at this - thanks for pointing it out.

Jeremy.


Re: svn commit: samba r11233 - in branches/SAMBA_3_0/source/smbd: .

2005-10-23 Thread Alexander Bokovoy
On Sun, Oct 23, 2005 at 11:29:16AM -0700, Jeremy Allison wrote:
> On Sun, Oct 23, 2005 at 04:15:57PM +1000, James Peach wrote:
> > On Thu, 2005-10-20 at 18:15 +, [EMAIL PROTECTED] wrote:
> > > Author: jra
> > > Date: 2005-10-20 18:15:44 + (Thu, 20 Oct 2005)
> > > New Revision: 11233
> > > 
> > > WebSVN: 
> > > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11233
> > > 
> > > Log:
> > > Forgot to add the statvfs file. Oops.
> > 
> > Should this be merged with the statfs/statvfs calls in fs_usage()?
> 
> Maybe - it was a point patch from ab - there was something
> missing from the POSIX point of view for Linux clients. I'll
> take a look at this - thanks for pointing it out.
You mean lib/fsusage.c? I'll try to use that code though we need a bit
more for Steve's client needs (which is documented in vfs.h in
vfs_statvfs_struct)

-- 
/ Alexander Bokovoy
Samba Team  http://www.samba.org/
ALT Linux Team  http://www.altlinux.org/
Midgard Project Ry  http://www.midgard-project.org/


signature.asc
Description: Digital signature


svn commit: samba r11268 - in trunk/source/param: .

2005-10-23 Thread jra
Author: jra
Date: 2005-10-23 19:00:37 + (Sun, 23 Oct 2005)
New Revision: 11268

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

Log:
Ensure the new canonicalize_servicename() is mb safe.
MB service names may contain embedded ' ' characters.
Jeremy.

Modified:
   trunk/source/param/loadparm.c


Changeset:
Modified: trunk/source/param/loadparm.c
===
--- trunk/source/param/loadparm.c   2005-10-23 17:22:00 UTC (rev 11267)
+++ trunk/source/param/loadparm.c   2005-10-23 19:00:37 UTC (rev 11268)
@@ -2452,7 +2452,7 @@
static fstring canon; /* is fstring large enough? */
int dst_idx = 0;
 
-   for (; *src != '\0'; src++) {
+   for (; *src != '\0'; src += next_mb_char_size(src)) {
if (isspace(*src)) {
continue;
}



svn commit: samba r11269 - in branches/SAMBA_3_0/source/param: .

2005-10-23 Thread jra
Author: jra
Date: 2005-10-23 19:00:40 + (Sun, 23 Oct 2005)
New Revision: 11269

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

Log:
Ensure the new canonicalize_servicename() is mb safe.
MB service names may contain embedded ' ' characters.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c  2005-10-23 19:00:37 UTC (rev 
11268)
+++ branches/SAMBA_3_0/source/param/loadparm.c  2005-10-23 19:00:40 UTC (rev 
11269)
@@ -2452,7 +2452,7 @@
static fstring canon; /* is fstring large enough? */
int dst_idx = 0;
 
-   for (; *src != '\0'; src++) {
+   for (; *src != '\0'; src += next_mb_char_size(src)) {
if (isspace(*src)) {
continue;
}



svn commit: samba r11270 - in branches/SAMBA_4_0/source: auth auth/gensec dsdb dsdb/samdb include kdc rpc_server rpc_server/drsuapi

2005-10-23 Thread abartlet
Author: abartlet
Date: 2005-10-23 22:20:42 + (Sun, 23 Oct 2005)
New Revision: 11270

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

Log:
Move the core CrackNames code from rpc_server/drsuapi to dsdb/samdb.
I'm sure this will not be the final resting place, but it will do for
now.

Use the cracknames code in auth/ for creating a server_info given a
principal name only (should avoid assumtions about spliting a
[EMAIL PROTECTED] principal).

Andrew Bartlett

Added:
   branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c
Removed:
   branches/SAMBA_4_0/source/rpc_server/drsuapi/drsuapi_cracknames.c
Modified:
   branches/SAMBA_4_0/source/auth/auth_sam.c
   branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
   branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
   branches/SAMBA_4_0/source/dsdb/config.mk
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/kdc/pac-glue.c
   branches/SAMBA_4_0/source/rpc_server/config.mk
   branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c


Changeset:
Sorry, the patch is too large (2009 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11270


svn commit: lorikeet r481 - in trunk/heimdal: . appl/ftp appl/ftp/ftp appl/ftp/ftpd appl/login appl/popper appl/rcp appl/rsh appl/su appl/telnet appl/telnet/libtelnet appl/telnet/telnet appl/xnlock cf

2005-10-23 Thread abartlet
Author: abartlet
Date: 2005-10-23 23:12:08 + (Sun, 23 Oct 2005)
New Revision: 481

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

Log:
Update to Heimdal CVS as of 2005-10-24

Andrew Bartlett

Added:
   trunk/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-29.txt
   
trunk/heimdal/doc/standardisation/draft-ietf-kitten-extended-mech-inquiry-01.txt
   
trunk/heimdal/doc/standardisation/draft-ietf-kitten-gssapi-channel-bindings-01.txt
   
trunk/heimdal/doc/standardisation/draft-ietf-kitten-gssapi-domain-based-names-01.txt
   
trunk/heimdal/doc/standardisation/draft-ietf-kitten-gssapi-extensions-iana-01.txt
   trunk/heimdal/doc/standardisation/draft-ietf-kitten-gssapi-naming-exts-01.txt
   trunk/heimdal/doc/standardisation/draft-ietf-kitten-gssapi-store-cred-01.txt
   trunk/heimdal/doc/standardisation/draft-ietf-kitten-gssapi-v3-guide-to-01.txt
   
trunk/heimdal/doc/standardisation/draft-ietf-kitten-stackable-pseudo-mechs-01.txt
   
trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-kerberos-set-passwd-04.txt
   trunk/heimdal/lib/roken/dumpdata.c
Modified:
   trunk/heimdal/ChangeLog
   trunk/heimdal/NEWS
   trunk/heimdal/appl/ftp/ChangeLog
   trunk/heimdal/appl/ftp/ftp/cmdtab.c
   trunk/heimdal/appl/ftp/ftp/ftp.1
   trunk/heimdal/appl/ftp/ftp/ftp_var.h
   trunk/heimdal/appl/ftp/ftp/globals.c
   trunk/heimdal/appl/ftp/ftp/gssapi.c
   trunk/heimdal/appl/ftp/ftp/main.c
   trunk/heimdal/appl/ftp/ftp/ruserpass.c
   trunk/heimdal/appl/ftp/ftp/security.c
   trunk/heimdal/appl/ftp/ftp/security.h
   trunk/heimdal/appl/ftp/ftpd/ftpd.c
   trunk/heimdal/appl/ftp/ftpd/gss_userok.c
   trunk/heimdal/appl/ftp/ftpd/ls.c
   trunk/heimdal/appl/login/login.c
   trunk/heimdal/appl/popper/ChangeLog
   trunk/heimdal/appl/popper/pop_dropinfo.c
   trunk/heimdal/appl/rcp/ChangeLog
   trunk/heimdal/appl/rcp/rcp.c
   trunk/heimdal/appl/rsh/ChangeLog
   trunk/heimdal/appl/rsh/rsh.c
   trunk/heimdal/appl/rsh/rsh_locl.h
   trunk/heimdal/appl/rsh/rshd.c
   trunk/heimdal/appl/su/ChangeLog
   trunk/heimdal/appl/su/su.c
   trunk/heimdal/appl/telnet/ChangeLog
   trunk/heimdal/appl/telnet/libtelnet/kerberos.c
   trunk/heimdal/appl/telnet/libtelnet/kerberos5.c
   trunk/heimdal/appl/telnet/telnet/commands.c
   trunk/heimdal/appl/xnlock/ChangeLog
   trunk/heimdal/appl/xnlock/xnlock.c
   trunk/heimdal/cf/ChangeLog
   trunk/heimdal/cf/roken-frag.m4
   trunk/heimdal/doc/programming.texi
   trunk/heimdal/kdc/config.c
   trunk/heimdal/kdc/kdc.h
   trunk/heimdal/kdc/kerberos5.c
   trunk/heimdal/kdc/pkinit.c
   trunk/heimdal/kuser/klist.1
   trunk/heimdal/kuser/klist.c
   trunk/heimdal/lib/asn1/Makefile.am
   trunk/heimdal/lib/asn1/check-der.c
   trunk/heimdal/lib/asn1/der.h
   trunk/heimdal/lib/asn1/pkinit.asn1
   trunk/heimdal/lib/asn1/rfc2459.asn1
   trunk/heimdal/lib/gssapi/ChangeLog
   trunk/heimdal/lib/gssapi/acquire_cred.c
   trunk/heimdal/lib/gssapi/display_status.c
   trunk/heimdal/lib/gssapi/gssapi_locl.h
   trunk/heimdal/lib/gssapi/init_sec_context.c
   trunk/heimdal/lib/hdb/hdb.c
   trunk/heimdal/lib/kafs/ChangeLog
   trunk/heimdal/lib/kafs/afssys.c
   trunk/heimdal/lib/kafs/kafs.3
   trunk/heimdal/lib/kafs/kafs.h
   trunk/heimdal/lib/kafs/kafs_locl.h
   trunk/heimdal/lib/krb5/Makefile.am
   trunk/heimdal/lib/krb5/acache.c
   trunk/heimdal/lib/krb5/cache.c
   trunk/heimdal/lib/krb5/init_creds.c
   trunk/heimdal/lib/krb5/init_creds_pw.c
   trunk/heimdal/lib/krb5/kerberos.8
   trunk/heimdal/lib/krb5/keytab_keyfile.c
   trunk/heimdal/lib/krb5/krb5.h
   trunk/heimdal/lib/krb5/krb5_ccache.3
   trunk/heimdal/lib/krb5/krb5_err.et
   trunk/heimdal/lib/krb5/krb5_get_credentials.3
   trunk/heimdal/lib/krb5/krb5_locl.h
   trunk/heimdal/lib/krb5/krb5_mk_req.3
   trunk/heimdal/lib/krb5/krb5_principal.3
   trunk/heimdal/lib/krb5/krbhst.c
   trunk/heimdal/lib/krb5/mcache.c
   trunk/heimdal/lib/krb5/pkinit.c
   trunk/heimdal/lib/krb5/rd_cred.c
   trunk/heimdal/lib/krb5/test_cc.c
   trunk/heimdal/lib/roken/ChangeLog
   trunk/heimdal/lib/roken/Makefile.am
   trunk/heimdal/lib/roken/roken-common.h
   trunk/heimdal/lib/roken/roken.h


Changeset:
Sorry, the patch is too large (16925 lines) to include; please use WebSVN to 
see it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=481


Build status as of Mon Oct 24 00:00:01 2005

2005-10-23 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2005-10-23 
00:00:12.0 +
+++ /home/build/master/cache/broken_results.txt 2005-10-24 00:00:08.0 
+
@@ -1,17 +1,17 @@
-Build status as of Sun Oct 23 00:00:01 2005
+Build status as of Mon Oct 24 00:00:01 2005
 
 Build counts:
 Tree Total  Broken Panic 
 ccache   11 2  0 
-distcc   12 3  0 
-lorikeet-heimdal 17 11 0 
+distcc   13 3  0 
+lorikeet-heimdal 21 19 0 
 ppp  16 0  0 
 rsync35 2  0 
-samba3  0  0 
+samba2  0  0 
 samba-docs   0  0  0 
-samba4   36 18 6 
-samba_3_036 11 0 
+samba4   36 19 6 
+samba_3_036 9  0 
 smb-build27 5  0 
-talloc   34 15 0 
+talloc   34 14 0 
 tdb  34 4  0 
 


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

2005-10-23 Thread vlendec
Author: vlendec
Date: 2005-10-24 04:19:27 + (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;
 }