]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: fix lock_flav initialization in smbd_smb2_lock_send()
authorRalph Boehme <slow@samba.org>
Fri, 7 Mar 2025 13:14:32 +0000 (14:14 +0100)
committerRalph Boehme <slow@samba.org>
Fri, 7 Mar 2025 19:00:32 +0000 (19:00 +0000)
Right above we did

        if (posix_handle) {
                locks[i].lock_flav = POSIX_LOCK;
        } else {
                locks[i].lock_flav = WINDOWS_LOCK;
        }

which came in with commit f68fffa85d1de992384a210bb0b9261cda3fb168,
apparently forgetting to remove the previously existing initialization
locks[i].lock_flav=WINDOWS_LOCK.

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
source3/smbd/smb2_lock.c

index b90fbb1dfcbf0495aeb754c9640eb6749952db48..d39066c906fd8ce305914ff65f43b00484f963a6 100644 (file)
@@ -460,7 +460,6 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
                } else {
                        locks[i].brltype = UNLOCK_LOCK;
                }
-               locks[i].lock_flav = WINDOWS_LOCK;
 
                DBG_DEBUG("index %"PRIu16" offset=%"PRIu64", count=%"PRIu64", "
                          "smblctx = %"PRIu64" type %d\n",