[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  c89fa0d s3/vfs: gpfs: adapt vfs_gpfs_is_offline() to changes from 
3031815f982e365be50148564d47d7d5afab46e0
       via  2651971 s3/vfs: tsmsm: add missing ;
      from  1f0dd8f talloc: Fix CID 1373619 Unchecked return value

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


- Log -----------------------------------------------------------------
commit c89fa0d41cfbaf4d4d7438ebdf2d8db16fbc6e62
Author: Ralph Boehme <s...@samba.org>
Date:   Mon Oct 17 14:16:20 2016 +0200

    s3/vfs: gpfs: adapt vfs_gpfs_is_offline() to changes from 
3031815f982e365be50148564d47d7d5afab46e0
    
    The patchset `git log -2 3031815f982e365be50148564d47d7d5afab46e0`
    missed a change to vfs_gpfs_is_offline() which is now merely a helper
    function that returns true or false and mustn't call into the VFS.
    
    Signed-off-by: Ralph Boehme <s...@samba.org>
    Reviewed-by: David Disseldorp <dd...@samba.org>
    
    Autobuild-User(master): David Disseldorp <dd...@samba.org>
    Autobuild-Date(master): Mon Oct 17 21:28:12 CEST 2016 on sn-devel-144

commit 2651971fb32aa59c88dac37feaa8fe6a1343276f
Author: Ralph Boehme <s...@samba.org>
Date:   Mon Oct 17 14:15:41 2016 +0200

    s3/vfs: tsmsm: add missing ;
    
    Signed-off-by: Ralph Boehme <s...@samba.org>
    Reviewed-by: David Disseldorp <dd...@samba.org>

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

Summary of changes:
 source3/modules/vfs_gpfs.c  | 7 +++----
 source3/modules/vfs_tsmsm.c | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 28da8e2..89ce3b7 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -2007,13 +2007,12 @@ static bool vfs_gpfs_is_offline(struct 
vfs_handle_struct *handle,
                                return -1);
 
        if (!config->winattr) {
-               return SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
+               return false;
        }
 
        status = get_full_smb_filename(talloc_tos(), fname, &path);
        if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
+               return false;
        }
 
        ret = gpfswrap_get_winattrs_path(path, &attrs);
@@ -2029,7 +2028,7 @@ static bool vfs_gpfs_is_offline(struct vfs_handle_struct 
*handle,
        }
        DEBUG(10, ("%s is online\n", path));
        TALLOC_FREE(path);
-       return SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
+       return false;
 }
 
 static bool vfs_gpfs_fsp_is_offline(struct vfs_handle_struct *handle,
diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c
index aa0ae96..eba19ff 100644
--- a/source3/modules/vfs_tsmsm.c
+++ b/source3/modules/vfs_tsmsm.c
@@ -521,7 +521,7 @@ static NTSTATUS tsmsm_set_offline(struct vfs_handle_struct 
*handle,
                return NT_STATUS_NO_MEMORY;
        }
        DEBUG(10, ("tsmsm_set_offline: Running [%s]\n", command));
-       result = smbrun(command, NULL, NULL)
+       result = smbrun(command, NULL, NULL);
        if(result != 0) {
                DEBUG(1,("tsmsm_set_offline: Running [%s] returned %d\n", 
command, result));
                TALLOC_FREE(command);


-- 
Samba Shared Repository