s3:locking: pass down servicepath to leases_db_add()

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/locking/leases_db.c b/source3/locking/leases_db.c
index ed4f09a0ff43934a281862af3c285ffab3430203..a9e25666523eac8a4f3e5192bdabc576d9065ee5 100644 (file)
--- a/source3/locking/leases_db.c
+++ b/source3/locking/leases_db.c
@@ -85,6 +85,7 @@ static bool leases_db_key(TALLOC_CTX *mem_ctx,
 NTSTATUS leases_db_add(const struct GUID *client_guid,
                       const struct smb2_lease_key *lease_key,
                       const struct file_id *id,
+                      const char *servicepath,
                       const char *filename,
                       const char *stream_name)
 {
@@ -405,6 +406,7 @@ NTSTATUS leases_db_rename(const struct GUID *client_guid,
        return leases_db_add(client_guid,
                                lease_key,
                                id,
+                               servicename_new,
                                filename_new,
                                stream_name_new);
 }

diff --git a/source3/locking/leases_db.h b/source3/locking/leases_db.h
index 0daa0ecade945385d8594f1afb4344f03bf009b4..20ec52292095aabe4b4524dfa9afaf0370c198df 100644 (file)
--- a/source3/locking/leases_db.h
+++ b/source3/locking/leases_db.h
@@ -30,6 +30,7 @@ bool leases_db_init(bool read_only);
 NTSTATUS leases_db_add(const struct GUID *client_guid,
                       const struct smb2_lease_key *lease_key,
                       const struct file_id *id,
+                      const char *servicepath,
                       const char *filename,
                       const char *stream_name);
 NTSTATUS leases_db_del(const struct GUID *client_guid,

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8f19a36cb610274a6e62b437b670cc0fc4cf2574..c1a8ee0f327cb42b0f257b10eb2a65d6a85ce592 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1677,8 +1677,11 @@ static NTSTATUS grant_fsp_lease(struct files_struct *fsp,
                .epoch = fsp->lease->lease.lease_epoch,
        };
 
-       status = leases_db_add(client_guid, &lease->lease_key,
-                              &fsp->file_id, fsp->fsp_name->base_name,
+       status = leases_db_add(client_guid,
+                              &lease->lease_key,
+                              &fsp->file_id,
+                              fsp->conn->connectpath,
+                              fsp->fsp_name->base_name,
                               fsp->fsp_name->stream_name);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("%s: leases_db_add failed: %s\n", __func__,