[SCM] Samba Shared Repository - branch master updated

[Anoop C S]

The branch, master has been updated
       via  c5bb40ec8c6 vfs_shadow_copy2: Fix a log message
       via  f0904a2fba6 vfs_shadow_copy: Fix a log message
      from  27709178e02 python: Fix get_max_worker_count() to always have two runners

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


- Log -----------------------------------------------------------------
commit c5bb40ec8c6124d9dab5b0a09ef782f88208bceb
Author: Anoop C S <anoopcs at samba.org>
Date:   Sat Jun 20 17:14:40 2020 +0530

    vfs_shadow_copy2: Fix a log message
    
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Anoop C S <anoopcs at samba.org>
    Autobuild-Date(master): Sun Jun 21 16:20:26 UTC 2020 on sn-devel-184

commit f0904a2fba63a96194260ab93da9f24a16410a8e
Author: Anoop C S <anoopcs at samba.org>
Date:   Sat Jun 20 17:13:49 2020 +0530

    vfs_shadow_copy: Fix a log message
    
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/modules/vfs_shadow_copy.c  | 3 +--
 source3/modules/vfs_shadow_copy2.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c
index c4af04f1ec8..31333dc2239 100644
--- a/source3/modules/vfs_shadow_copy.c
+++ b/source3/modules/vfs_shadow_copy.c
@@ -192,8 +192,7 @@ static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle,
 	dir_hnd = OpenDir(talloc_tos(), handle->conn, smb_fname, NULL, 0);
 	TALLOC_FREE(smb_fname);
 	if (dir_hnd == NULL) {
-		DBG_ERR("SMB_VFS_NEXT_OPENDIR() failed for [%s]\n",
-			fsp->conn->connectpath);
+		DBG_ERR("OpenDir() failed for [%s]\n", fsp->conn->connectpath);
 		return -1;
 	}
 
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 6a1e560988e..3be93f985dd 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -2016,8 +2016,8 @@ static int shadow_copy2_get_shadow_copy_data(
 
 	p = SMB_VFS_NEXT_FDOPENDIR(handle, dirfsp, NULL, 0);
 	if (!p) {
-		DEBUG(2,("shadow_copy2: SMB_VFS_NEXT_OPENDIR() failed for '%s'"
-			 " - %s\n", snapdir, strerror(errno)));
+		DBG_NOTICE("shadow_copy2: SMB_VFS_NEXT_FDOPENDIR() failed for '%s'"
+			   " - %s\n", snapdir, strerror(errno));
 		errno = ENOSYS;
 		goto done;
 	}


-- 
Samba Shared Repository