[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  809247973d9 s3:locking: simplify code in get_share_mode_lock()
      from  e30607aff31 s4/smb_server: Fix handling of SMB2 messages after Netbios session setup

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


- Log -----------------------------------------------------------------
commit 809247973d9441c3d5249a7143cde6e858935d79
Author: Ralph Boehme <slow at samba.org>
Date:   Thu Nov 28 10:18:29 2019 +0000

    s3:locking: simplify code in get_share_mode_lock()
    
    The call to get_static_share_mode_data() is identical in the if/else branches,
    so move it behind them.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Dec  5 20:12:23 UTC 2019 on sn-devel-184

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

Summary of changes:
 source3/locking/share_mode_lock.c | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index c42cafe17e4..edf47274d29 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -615,18 +615,6 @@ struct share_mode_lock *get_share_mode_lock(
 		static_share_mode_record_value = dbwrap_record_get_value(
 			static_share_mode_record);
 
-		status = get_static_share_mode_data(
-			static_share_mode_record,
-			id,
-			servicepath,
-			smb_fname,
-			old_write_time);
-		if (!NT_STATUS_IS_OK(status)) {
-			DBG_DEBUG("get_static_share_mode_data failed: %s\n",
-				  nt_errstr(status));
-			TALLOC_FREE(static_share_mode_record);
-			goto fail;
-		}
 	} else {
 		TDB_DATA static_key;
 		int cmp;
@@ -639,18 +627,18 @@ struct share_mode_lock *get_share_mode_lock(
 				    "simultaneously\n");
 			return NULL;
 		}
+	}
 
-		status = get_static_share_mode_data(
-			static_share_mode_record,
-			id,
-			servicepath,
-			smb_fname,
-			old_write_time);
-		if (!NT_STATUS_IS_OK(status)) {
-			DBG_WARNING("get_static_share_mode_data failed: %s\n",
-				    nt_errstr(status));
-			goto fail;
-		}
+	status = get_static_share_mode_data(static_share_mode_record,
+					    id,
+					    servicepath,
+					    smb_fname,
+					    old_write_time);
+	if (!NT_STATUS_IS_OK(status)) {
+		DBG_DEBUG("get_static_share_mode_data failed: %s\n",
+			  nt_errstr(status));
+		TALLOC_FREE(static_share_mode_record);
+		goto fail;
 	}
 
 done:


-- 
Samba Shared Repository