[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c87d4e5 s3: Remove talloc_autofree_context() from dmapi.c
       via  414cd91 s3: Remove talloc_autofree_context() from unexpected.c
       via  da0ef65 s3: Remove talloc_autofree_context() from srv_samr_nt.c
       via  41b54a8 s3: Remove talloc_autofree_context from pdb_interface
      from  32ec1b3 s4-kcc: silence "Testing kcctpl_create_intersite_connections" message

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


- Log -----------------------------------------------------------------
commit c87d4e5ddbbafea6f0d2dd5062041d41e80db877
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 2 23:49:06 2010 +0200

    s3: Remove talloc_autofree_context() from dmapi.c
    
    This is a place where an explicit dmapi_destroy_session would be needed. But we
    don't use a destructor for this.

commit 414cd919ffa2bdc842fc66ee2dc286448a92fc7d
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 2 23:44:58 2010 +0200

    s3: Remove talloc_autofree_context() from unexpected.c
    
    Same argument as in 997a64f6fb11e19d78c: If tdb_close() was needed at exit
    time, we'd have more severe problems by now.

commit da0ef65e04f3e4983f51bc6fb3c9297934da4447
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 2 23:40:48 2010 +0200

    s3: Remove talloc_autofree_context() from srv_samr_nt.c
    
    The dispinfo structs need to survive within a process across pipe opens,
    but they don't have a special destructor

commit 41b54a893116d04fcfb3b7f8d114917bd0f1a437
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 2 23:38:33 2010 +0200

    s3: Remove talloc_autofree_context from pdb_interface
    
    None of the pdb backends have special destructors that need to be run at
    program exit.

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

Summary of changes:
 source3/libsmb/unexpected.c      |    3 +--
 source3/passdb/pdb_interface.c   |    2 +-
 source3/rpc_server/srv_samr_nt.c |    6 ++----
 source3/smbd/dmapi.c             |    3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/unexpected.c b/source3/libsmb/unexpected.c
index 6daf61f..7f86495 100644
--- a/source3/libsmb/unexpected.c
+++ b/source3/libsmb/unexpected.c
@@ -45,8 +45,7 @@ void unexpected_packet(struct packet_struct *p)
 	uint32_t enc_ip;
 
 	if (!tdbd) {
-		tdbd = tdb_wrap_open(talloc_autofree_context(),
-				     lock_path("unexpected.tdb"), 0,
+		tdbd = tdb_wrap_open(NULL, lock_path("unexpected.tdb"), 0,
 				     TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_INCOMPATIBLE_HASH,
 				     O_RDWR | O_CREAT, 0644);
 		if (!tdbd) {
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 11b70f2..e57ee7b 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -2110,7 +2110,7 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods )
 {
 	/* allocate memory for the structure as its own talloc CTX */
 
-	*methods = talloc_zero(talloc_autofree_context(), struct pdb_methods);
+	*methods = talloc_zero(NULL, struct pdb_methods);
 	if (*methods == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index efcf18a..bd82a34 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -331,8 +331,7 @@ static DISP_INFO *get_samr_dispinfo_by_sid(const struct dom_sid *psid)
 		 * Necessary only once, but it does not really hurt.
 		 */
 		if (builtin_dispinfo == NULL) {
-			builtin_dispinfo = talloc_zero(
-				talloc_autofree_context(), struct disp_info);
+			builtin_dispinfo = talloc_zero(NULL, struct disp_info);
 			if (builtin_dispinfo == NULL) {
 				return NULL;
 			}
@@ -347,8 +346,7 @@ static DISP_INFO *get_samr_dispinfo_by_sid(const struct dom_sid *psid)
 		 * Necessary only once, but it does not really hurt.
 		 */
 		if (domain_dispinfo == NULL) {
-			domain_dispinfo = talloc_zero(
-				talloc_autofree_context(), struct disp_info);
+			domain_dispinfo = talloc_zero(NULL, struct disp_info);
 			if (domain_dispinfo == NULL) {
 				return NULL;
 			}
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c
index 8c3939f..e213d73 100644
--- a/source3/smbd/dmapi.c
+++ b/source3/smbd/dmapi.c
@@ -188,8 +188,7 @@ const void *dmapi_get_current_session(void)
 bool dmapi_have_session(void)
 {
 	if (!dmapi_ctx) {
-		dmapi_ctx = talloc(talloc_autofree_context(),
-				   struct smbd_dmapi_context);
+		dmapi_ctx = talloc(struct smbd_dmapi_context);
 		if (!dmapi_ctx) {
 			exit_server("unable to allocate smbd_dmapi_context");
 		}


-- 
Samba Shared Repository