[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Wed Dec 16 00:02:51 UTC 2015


The branch, master has been updated
       via  4767291 vfs_glusterfs: Attach missing destructor.
       via  0062177 smbd: Fix CID 1343333 Uninitialized variables
      from  5a72a2e dns_server: Remove unused handle_question

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


- Log -----------------------------------------------------------------
commit 4767291cb9b57c57b13f8d02bc8632c794baa825
Author: Ira Cooper <ira at samba.org>
Date:   Tue Dec 15 07:20:38 2015 -0500

    vfs_glusterfs: Attach missing destructor.
    
    This activates the new AIO code's cancellation logic.
    
    Signed-off-by: Ira Cooper <ira at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Dec 15 23:33:12 CET 2015 on sn-devel-104

commit 0062177d8128036afdc172d713fbf3b8d0e88af7
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 15 11:06:35 2015 +0100

    smbd: Fix CID 1343333 Uninitialized variables
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/modules/vfs_glusterfs.c     | 5 ++---
 source3/smbd/smb2_query_directory.c | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 8025cd6..e0cf719 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -500,10 +500,8 @@ struct glusterfs_aio_state {
 	bool cancelled;
 };
 
-static int aio_wrapper_destructor(void *ptr)
+static int aio_wrapper_destructor(struct glusterfs_aio_wrapper *wrap)
 {
-	struct glusterfs_aio_wrapper *wrap = (struct glusterfs_aio_wrapper *)ptr;
-
 	wrap->state->cancelled = true;
 
 	return 0;
@@ -658,6 +656,7 @@ static struct glusterfs_aio_state *aio_state_create(TALLOC_CTX *mem_ctx)
 		return NULL;
 	}
 
+	talloc_set_destructor(wrapper, aio_wrapper_destructor);
 	state->cancelled = false;
 	state->ret = 0;
 	state->err = 0;
diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 73f2d63..56dab69 100644
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -225,7 +225,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
 	uint32_t dirtype = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY;
 	bool dont_descend = false;
 	bool ask_sharemode = true;
-	bool wcard_has_wild;
+	bool wcard_has_wild = false;
 	struct tm tm;
 	char *p;
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list