[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  d2aa10c libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593)
      from  1d61fe6 s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit d2aa10c255932b2d3060fcfc5cea19caef213724
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Nov 10 14:43:55 2011 +0100

    libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593)
    
    After a calling any wrapper of tevent_req_notify_callback(),
    e.g. tevent_req_nterror(), tevent_req_done(), tevent_req_nomem(),
    a function has to return immediately otherwise it is very likely to
    crash.
    
    metze
    
    (similar to commit 17f1a97a614db4ed8292544988cb6a6cf56621d8)

-----------------------------------------------------------------------

Summary of changes:
 libcli/cldap/cldap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 191d0ee..a01cbf8 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -278,6 +278,7 @@ nomem:
 error:
 	status = map_nt_error_from_unix(in->recv_errno);
 nterror:
+	TALLOC_FREE(in);
 	/* in connected mode the first pending search gets the error */
 	if (!c->connected) {
 		/* otherwise we just ignore the error */
@@ -288,7 +289,7 @@ nterror:
 	}
 	tevent_req_nterror(c->searches.list->req, status);
 done:
-	talloc_free(in);
+	TALLOC_FREE(in);
 }
 
 /*


-- 
Samba Shared Repository