[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  a4a85aca324 s3: VFS: Remove logically dead code. Coverity CID: 1419117
      from  4a272b83af6 s3:passdb: Use discard_const_p() in py_passdb

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


- Log -----------------------------------------------------------------
commit a4a85aca3242f56e94a487e7eb3e09684bd397da
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 9 11:23:21 2018 -0800

    s3: VFS: Remove logically dead code. Coverity CID: 1419117
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Böhme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Nov 14 21:35:45 CET 2018 on sn-devel-144

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

Summary of changes:
 source3/smbd/vfs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 28ebfc92dc7..351cd0a5567 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -787,7 +787,6 @@ const char *vfs_readdirname(connection_struct *conn, void *p,
 int vfs_ChDir(connection_struct *conn, const struct smb_filename *smb_fname)
 {
 	int ret;
-	int saved_errno = 0;
 	struct smb_filename *old_cwd = conn->cwd_fname;
 
 	if (!LastDir) {
@@ -825,7 +824,7 @@ int vfs_ChDir(connection_struct *conn, const struct smb_filename *smb_fname)
 		 * Return to original directory
 		 * and return -1.
 		 */
-		saved_errno = errno;
+		int saved_errno = errno;
 
 		if (old_cwd == NULL) {
 			/*
@@ -860,9 +859,6 @@ int vfs_ChDir(connection_struct *conn, const struct smb_filename *smb_fname)
 	DEBUG(4,("vfs_ChDir got %s\n", conn->cwd_fname->base_name));
 
 	TALLOC_FREE(old_cwd);
-	if (saved_errno != 0) {
-		errno = saved_errno;
-	}
 	return ret;
 }
 


-- 
Samba Shared Repository