[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fec300b vfs: Consolidate failure paths in vfswrap_init_asys_ctx
       via  93af8a1 vfs: Fix CID 1035384 Unchecked return value from library
      from  f58ecfd s3:smbd: change a loglevel from 0 to 1 when SMB_VFS_CONNECT fails

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


- Log -----------------------------------------------------------------
commit fec300b0c1efeb95f504bc3d1fdbb47f88f76d23
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 16 15:01:09 2015 +0200

    vfs: Consolidate failure paths in vfswrap_init_asys_ctx
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Jul 17 01:35:33 CEST 2015 on sn-devel-104

commit 93af8a1a230f2564cc8bbd3b3c7f973a3033a0d1
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 16 15:00:12 2015 +0200

    vfs: Fix CID 1035384 Unchecked return value from library
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/modules/vfs_default.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 9a0a46e..490c4ab 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -704,7 +704,11 @@ static bool vfswrap_init_asys_ctx(struct smbd_server_connection *conn)
 
 	fd = asys_signalfd(conn->asys_ctx);
 
-	set_blocking(fd, false);
+	ret = set_blocking(fd, false);
+	if (ret != 0) {
+		DBG_WARNING("set_blocking failed: %s\n", strerror(ret));
+		goto fail;
+	}
 
 	conn->asys_fde = tevent_add_fd(conn->ev_ctx, conn, fd,
 				       TEVENT_FD_READ,
@@ -712,11 +716,14 @@ static bool vfswrap_init_asys_ctx(struct smbd_server_connection *conn)
 				       conn->asys_ctx);
 	if (conn->asys_fde == NULL) {
 		DEBUG(1, ("tevent_add_fd failed\n"));
-		asys_context_destroy(conn->asys_ctx);
-		conn->asys_ctx = NULL;
-		return false;
+		goto fail;
 	}
 	return true;
+
+fail:
+	asys_context_destroy(conn->asys_ctx);
+	conn->asys_ctx = NULL;
+	return false;
 }
 
 struct vfswrap_asys_state {


-- 
Samba Shared Repository