[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  220c617 s3/dbwrap_ctdb: free resources in an error code path
       via  556d262 s3/dbwrap_ctdb: set async_ctx to initialized
      from  202e2ab s3-rpcclient: Fix enumdata spoolss display of REG_DWORD

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


- Log -----------------------------------------------------------------
commit 220c617cc03c90bee78711a7ca692932a675203d
Author: Ralph Boehme <slow at samba.org>
Date:   Fri May 5 22:31:54 2017 +0200

    s3/dbwrap_ctdb: free resources in an error code path
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Sun May  7 16:40:19 CEST 2017 on sn-devel-144

commit 556d26230f6bee2fefcd6e1e2be1fec7b908b133
Author: Ralph Boehme <slow at samba.org>
Date:   Fri May 5 22:30:32 2017 +0200

    s3/dbwrap_ctdb: set async_ctx to initialized
    
    After initializing the async connection to ctdb we must set initialized
    to true.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 source3/lib/dbwrap/dbwrap_ctdb.c | 2 ++
 1 file changed, 2 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 87ac8e1..10fe88d 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -106,9 +106,11 @@ static int ctdb_async_ctx_init_internal(TALLOC_CTX *mem_ctx,
 	ret = ctdbd_setup_fde(ctdb_async_ctx.async_conn, ev);
 	if (ret != 0) {
 		DBG_ERR("ctdbd_setup_ev failed\n");
+		TALLOC_FREE(ctdb_async_ctx.async_conn);
 		return ret;
 	}
 
+	ctdb_async_ctx.initialized = true;
 	return 0;
 }
 


-- 
Samba Shared Repository