[SCM] Samba Shared Repository - branch master updated

Uri Simchoni uri at samba.org
Wed Mar 9 20:52:03 UTC 2016


The branch, master has been updated
       via  5741e84 smbd: Avoid an "else"
       via  19cbdf9 vfs_united_media: Fix CID 1355492 Uninitialized scalar variable
      from  1c79654 configure: set HAVE___ATTRIBUTE__ for heimdal

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


- Log -----------------------------------------------------------------
commit 5741e849a9241a01a33510978684f66288de72ab
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 9 10:15:25 2016 +0100

    smbd: Avoid an "else"
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Wed Mar  9 21:51:52 CET 2016 on sn-devel-144

commit 19cbdf94099dea620ea3a0c4984607dc81fbcce7
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 9 08:51:34 2016 +0100

    vfs_united_media: Fix CID 1355492 Uninitialized scalar variable
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>

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

Summary of changes:
 source3/modules/vfs_unityed_media.c | 1 +
 source3/smbd/smbXsrv_open.c         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_unityed_media.c b/source3/modules/vfs_unityed_media.c
index 7544b8f..4bbb8fb 100644
--- a/source3/modules/vfs_unityed_media.c
+++ b/source3/modules/vfs_unityed_media.c
@@ -1510,6 +1510,7 @@ static NTSTATUS um_streaminfo(struct vfs_handle_struct *handle,
 				smb_fname,
 				&client_fname);
 	if (ret != 0) {
+		status = NT_STATUS_NO_MEMORY;
 		goto err;
 	}
 
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index a7cea18..fc7d434 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -468,7 +468,8 @@ static NTSTATUS smbXsrv_open_local_lookup(struct smbXsrv_open_table *table,
 				     &state);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
 		return NT_STATUS_FILE_CLOSED;
-	} else if (!NT_STATUS_IS_OK(status)) {
+	}
+	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 	if (!NT_STATUS_IS_OK(state.status)) {


-- 
Samba Shared Repository



More information about the samba-cvs mailing list