[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  45e3b05 vfs: Fix CID 1312072 Failure to restore non-local value
       via  d7a33d8 vfs: Fix CID 1312073 Argument cannot be negative
      from  c3c024f WHATSNEW: Clear release notes for Samba 4.4.0pre1.

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


- Log -----------------------------------------------------------------
commit 45e3b05966ddd013ea931e65295978525261f7f4
Author: Volker Lendecke <v...@samba.org>
Date:   Tue Jul 21 09:51:09 2015 +0200

    vfs: Fix CID 1312072 Failure to restore non-local value
    
    Signed-off-by: Volker Lendecke <v...@samba.org>
    Reviewed-by: Jeremy Allison <j...@samba.org>
    
    Autobuild-User(master): Jeremy Allison <j...@samba.org>
    Autobuild-Date(master): Wed Jul 22 09:06:29 CEST 2015 on sn-devel-104

commit d7a33d8b3dd6042c15692ec83e3d633226f55189
Author: Volker Lendecke <v...@samba.org>
Date:   Tue Jul 21 09:45:23 2015 +0200

    vfs: Fix CID 1312073 Argument cannot be negative
    
    Signed-off-by: Volker Lendecke <v...@samba.org>
    Reviewed-by: Jeremy Allison <j...@samba.org>

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

Summary of changes:
 source3/modules/vfs_default.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 490c4ab..10d0f3b 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -690,39 +690,42 @@ static void vfswrap_asys_finished(struct tevent_context 
*ev,
 
 static bool vfswrap_init_asys_ctx(struct smbd_server_connection *conn)
 {
+       struct asys_context *ctx;
+       struct tevent_fd *fde;
        int ret;
        int fd;
 
        if (conn->asys_ctx != NULL) {
                return true;
        }
-       ret = asys_context_init(&conn->asys_ctx, aio_pending_size);
+
+       ret = asys_context_init(&ctx, aio_pending_size);
        if (ret != 0) {
                DEBUG(1, ("asys_context_init failed: %s\n", strerror(ret)));
                return false;
        }
 
-       fd = asys_signalfd(conn->asys_ctx);
+       fd = asys_signalfd(ctx);
 
        ret = set_blocking(fd, false);
        if (ret != 0) {
-               DBG_WARNING("set_blocking failed: %s\n", strerror(ret));
+               DBG_WARNING("set_blocking failed: %s\n", strerror(errno));
                goto fail;
        }
 
-       conn->asys_fde = tevent_add_fd(conn->ev_ctx, conn, fd,
-                                      TEVENT_FD_READ,
-                                      vfswrap_asys_finished,
-                                      conn->asys_ctx);
-       if (conn->asys_fde == NULL) {
+       fde = tevent_add_fd(conn->ev_ctx, conn, fd, TEVENT_FD_READ,
+                           vfswrap_asys_finished, ctx);
+       if (fde == NULL) {
                DEBUG(1, ("tevent_add_fd failed\n"));
                goto fail;
        }
+
+       conn->asys_ctx = ctx;
+       conn->asys_fde = fde;
        return true;
 
 fail:
-       asys_context_destroy(conn->asys_ctx);
-       conn->asys_ctx = NULL;
+       asys_context_destroy(ctx);
        return false;
 }
 


-- 
Samba Shared Repository