[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  eb24509 s3-messaging Do not ever send a kill to -1
       via  288265c s3-messaging Ensure that the message is of the correct legnth
       via  dce2315 s4-ldap_server: Fix segfault on startup failure of ldap server
       via  b5cc6a0 s3-pdb_samba4: Remove unused attribute from domain search
      from  fa2236c These modules are no longer experimental but production-ready (especially the acl_xattr code). Remove the "experimental" tag.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit eb245091e59402780d8a2136a30e0cf31398f7cf
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Sep 27 09:54:37 2011 -0700

    s3-messaging Do not ever send a kill to -1
    
    This from a report by Olaf Flebbe <o.flebbe at science-computing.de>
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Wed Sep 28 00:23:44 CEST 2011 on sn-devel-104

commit 288265c049f3f0600bd89efa61185c16d36ab017
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Sep 27 09:50:11 2011 -0700

    s3-messaging Ensure that the message is of the correct legnth
    
    By using ndr_pull_struct_blob_all we are more robust against wrongly formatted messages.
    
    Andrew Bartlett

commit dce23151e01adcbecc55fae51f7c3f4d085c2c4b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 26 15:56:23 2011 -0700

    s4-ldap_server: Fix segfault on startup failure of ldap server

commit b5cc6a0ad2ff3a3bf2004f65642f51ac64c8df3f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 26 15:56:00 2011 -0700

    s3-pdb_samba4: Remove unused attribute from domain search

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

Summary of changes:
 source3/lib/messages_local.c      |    5 ++++-
 source3/passdb/pdb_samba4.c       |    1 -
 source4/ldap_server/ldap_server.c |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 455f3d3..67234d4 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -200,7 +200,7 @@ static NTSTATUS messaging_tdb_fetch(TDB_CONTEXT *msg_tdb,
 
 	blob = data_blob_const(data.dptr, data.dsize);
 
-	ndr_err = ndr_pull_struct_blob(
+	ndr_err = ndr_pull_struct_blob_all(
 		&blob, result, result,
 		(ndr_pull_flags_fn_t)ndr_pull_messaging_array);
 
@@ -282,6 +282,9 @@ static NTSTATUS message_notify(struct server_id procid)
 	 */
 
 	SMB_ASSERT(pid > 0);
+	if (pid <= 0) {
+		return NT_STATUS_INVALID_HANDLE;
+	}
 
 	if (euid != 0) {
 		/* If we're not root become so to send the message. */
diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c
index 7a1c635..0146304 100644
--- a/source3/passdb/pdb_samba4.c
+++ b/source3/passdb/pdb_samba4.c
@@ -76,7 +76,6 @@ static struct pdb_domain_info *pdb_samba4_get_domain_info(
 	const char *dom_attrs[] = {
 		"objectSid", 
 		"objectGUID", 
-		"nTMixedDomain",
 		"fSMORoleOwner",
 		NULL
 	};
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 411be29..69a99aa 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -334,6 +334,8 @@ static void ldapsrv_accept(struct stream_connection *c,
 
 	conn->session_info = session_info;
 
+	conn->sockets.active = conn->sockets.raw;
+
 	if (!NT_STATUS_IS_OK(ldapsrv_backend_Init(conn))) {
 		ldapsrv_terminate_connection(conn, "backend Init failed");
 		return;
@@ -345,8 +347,6 @@ static void ldapsrv_accept(struct stream_connection *c,
 	/* register the server */	
 	irpc_add_name(c->msg_ctx, "ldap_server");
 
-	conn->sockets.active = conn->sockets.raw;
-
 	if (port != 636 && port != 3269) {
 		ldapsrv_call_read_next(conn);
 		return;


-- 
Samba Shared Repository