[PATCH] Fix a CID and a small cleanup

[Volker Lendecke]

Hi!

Review appreciated!

Thanks, Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From ec6090074676f2524b26b89dff6e24bc0258cc2e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 9 Mar 2016 08:51:34 +0100
Subject: [PATCH 1/2] vfs_united_media: Fix CID 1355492 Uninitialized scalar
 variable

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/modules/vfs_unityed_media.c |    1 +
 1 file changed, 1 insertion(+)

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;
 	}
 
-- 
1.7.9.5


From b72925cd8eed6513f42c978ebb0de3eeab17df05 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 9 Mar 2016 10:15:25 +0100
Subject: [PATCH 2/2] smbd: Avoid an "else"

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/smbd/smbXsrv_open.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)) {
-- 
1.7.9.5