smbd: pass lease, if any, to notify_fname()

notify_fname() for NOTIFY_ACTION_DIRLEASE_BREAK will soon need the lease of the
current open and to implement "MS-FSA 2.1.4.12 Algorithm to Check for an Oplock
Break" with flags=PARENT_OBJECT.

No change in behaviour for now, all callers pass lease=NULL;

Also change path arg to struct smb_filename.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index a8b4e38ff88c00c61285258f92c4f4a67de152a2..0f7ef45e3ee2152faccbad5d93b0331fc664e073 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -2335,9 +2335,11 @@ static ssize_t vfs_gpfs_pread(vfs_handle_struct *handle, files_struct *fsp,
        ret = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 
        if ((ret != -1) && was_offline) {
-               notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(handle->conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
 
        return ret;
@@ -2403,9 +2405,11 @@ static ssize_t vfs_gpfs_pread_recv(struct tevent_req *req,
 
        if ((state->ret != -1) && state->was_offline) {
                DEBUG(10, ("sending notify\n"));
-               notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(fsp->conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
 
        return state->ret;
@@ -2422,9 +2426,11 @@ static ssize_t vfs_gpfs_pwrite(vfs_handle_struct *handle, files_struct *fsp,
        ret = SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
 
        if ((ret != -1) && was_offline) {
-               notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(handle->conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
 
        return ret;
@@ -2491,9 +2497,11 @@ static ssize_t vfs_gpfs_pwrite_recv(struct tevent_req *req,
 
        if ((state->ret != -1) && state->was_offline) {
                DEBUG(10, ("sending notify\n"));
-               notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(fsp->conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
 
        return state->ret;

diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c
index 89191f7e3ae55be0d38083365fc33754efcacc3e..cc32996a1227b27777ad2c4c9051c5c9f36bfbb8 100644 (file)
--- a/source3/modules/vfs_tsmsm.c
+++ b/source3/modules/vfs_tsmsm.c
@@ -357,9 +357,11 @@ static ssize_t tsmsm_pread_recv(struct tevent_req *req,
        }
        if (state->ret >= 0 && state->was_offline) {
                struct files_struct *fsp = state->fsp;
-               notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(fsp->conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
        *vfs_aio_state = state->vfs_aio_state;
        return state->ret;
@@ -422,9 +424,11 @@ static ssize_t tsmsm_pwrite_recv(struct tevent_req *req,
        }
        if (state->ret >= 0 && state->was_offline) {
                struct files_struct *fsp = state->fsp;
-               notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(fsp->conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
        *vfs_aio_state = state->vfs_aio_state;
        return state->ret;
@@ -456,9 +460,11 @@ static ssize_t tsmsm_pread(struct vfs_handle_struct *handle, struct files_struct
            /* We can't actually force AIO at this point (came here not from reply_read_and_X) 
               what we can do is to send notification that file became online
            */
-               notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED,
-                            FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+           notify_fname(handle->conn,
+                        NOTIFY_ACTION_MODIFIED,
+                        FILE_NOTIFY_CHANGE_ATTRIBUTES,
+                        fsp->fsp_name,
+                        NULL);
        }
 
        return result;
@@ -474,9 +480,11 @@ static ssize_t tsmsm_pwrite(struct vfs_handle_struct *handle, struct files_struc
            /* We can't actually force AIO at this point (came here not from reply_read_and_X) 
               what we can do is to send notification that file became online
            */
-               notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED,
-                            FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+           notify_fname(handle->conn,
+                        NOTIFY_ACTION_MODIFIED,
+                        FILE_NOTIFY_CHANGE_ATTRIBUTES,
+                        fsp->fsp_name,
+                        NULL);
        }
 
        return result;

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 8909cd99c44610b4251e41b5bfbe6b970c558f0b..436b1cc876e23210866c84c474b25d20909a1e78 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -648,9 +648,11 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
        }
 
        if (lck_state.delete_object) {
-               notify_fname(conn, NOTIFY_ACTION_REMOVED,
+               notify_fname(conn,
+                            NOTIFY_ACTION_REMOVED,
                             FILE_NOTIFY_CHANGE_FILE_NAME,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
 
        return status;
@@ -1596,7 +1598,8 @@ done:
                notify_fname(conn,
                             NOTIFY_ACTION_REMOVED,
                             FILE_NOTIFY_CHANGE_DIR_NAME,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
 
        status1 = fd_close(fsp);

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 1b68f10c86f2d97a45f5f723836d46192043fc49..26356bc721b8287b366c81abfcb92afe20608485 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -1071,9 +1071,11 @@ int file_set_dosmode(connection_struct *conn,
 
 done:
        if (!newfile) {
-               notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+               notify_fname(conn,
+                            NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            smb_fname->base_name);
+                            smb_fname,
+                            NULL);
        }
        if (ret == 0) {
                smb_fname->st.st_ex_mode = unixmode;
@@ -1173,9 +1175,11 @@ NTSTATUS file_set_sparse(connection_struct *conn,
                return status;
        }
 
-       notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+       notify_fname(conn,
+                    NOTIFY_ACTION_MODIFIED,
                     FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                    fsp->fsp_name->base_name);
+                    fsp->fsp_name,
+                    NULL);
 
        fsp->fsp_name->st.cached_dos_attributes = new_dosmode;
        fsp->fsp_flags.is_sparse = sparse;

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index c6710a84b93183e1df437aa8f17e980c3704cc5a..569e089dea8f3898ee9c0a208bb5159a5f44e701 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -577,10 +577,14 @@ void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
        }
 }
 
-void notify_fname(connection_struct *conn, uint32_t action, uint32_t filter,
-                 const char *path)
+void notify_fname(struct connection_struct *conn,
+                 uint32_t action,
+                 uint32_t filter,
+                 const struct smb_filename *smb_fname,
+                 const struct smb2_lease *lease)
 {
        struct notify_context *notify_ctx = conn->sconn->notify_ctx;
+       const char *path = smb_fname->base_name;
 
        if (path[0] == '.' && path[1] == '/') {
                path += 2;

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ddce4fa58b50f6088869482264d459d739074945..9285c851c05bacf525560f903ea2798b7861bbee 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -4650,14 +4650,16 @@ unlock:
                notify_fname(conn,
                             NOTIFY_ACTION_ADDED,
                             FILE_NOTIFY_CHANGE_FILE_NAME,
-                            smb_fname->base_name);
+                            smb_fname,
+                            NULL);
        }
        if (truncated) {
                notify_fname(fsp->conn,
                             NOTIFY_ACTION_MODIFIED,
                             FILE_NOTIFY_CHANGE_SIZE |
                             FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+                            fsp->fsp_name,
+                            NULL);
        }
        if (!NT_STATUS_IS_OK(status)) {
                fd_close(fsp);
@@ -5531,7 +5533,8 @@ unlock:
                notify_fname(conn,
                             NOTIFY_ACTION_ADDED,
                             FILE_NOTIFY_CHANGE_DIR_NAME,
-                            smb_dname->base_name);
+                            smb_dname,
+                            NULL);
        }
 
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 5fffa34cd72281ed9892682da9bebad4a5640d42..f70cc224e8821f68d77c1b40d995074ca220a183 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -558,8 +558,11 @@ bool remove_pending_change_notify_requests_by_mid(
        struct smbd_server_connection *sconn, uint64_t mid);
 void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
                                                  NTSTATUS status);
-void notify_fname(connection_struct *conn, uint32_t action, uint32_t filter,
-                 const char *path);
+void notify_fname(struct connection_struct *conn,
+                 uint32_t action,
+                 uint32_t filter,
+                 const struct smb_filename *smb_fname,
+                 const struct smb2_lease *lease);
 char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32_t filter);
 struct sys_notify_context *sys_notify_context_create(TALLOC_CTX *mem_ctx,
                                                     struct tevent_context *ev);

diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 3413ffbf6d5b2e39e7a92d10507585e2753b83af..f4fa85c728dc163552d924e467fcf80db5bada25 100644 (file)
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -4170,8 +4170,11 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
                                &ft,
                                false);
        if (modify_mtime) {
-               notify_fname(conn, NOTIFY_ACTION_MODIFIED,
-                       FILE_NOTIFY_CHANGE_LAST_WRITE, smb_fname->base_name);
+               notify_fname(conn,
+                            NOTIFY_ACTION_MODIFIED,
+                            FILE_NOTIFY_CHANGE_LAST_WRITE,
+                            smb_fname,
+                            NULL);
        }
        return status;
 }

diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index 043be186612a384d072ebf2f328ff1d6431d6fa5..16c70eda3373303d42547538c69b1e4a9582738f 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1300,26 +1300,40 @@ static void notify_rename(struct connection_struct *conn,
        }
 
        if (strcmp(parent_dir_src, parent_dir_dst) == 0) {
-               notify_fname(conn, NOTIFY_ACTION_OLD_NAME, mask,
-                            smb_fname_src->base_name);
-               notify_fname(conn, NOTIFY_ACTION_NEW_NAME, mask,
-                            smb_fname_dst->base_name);
+               notify_fname(conn,
+                            NOTIFY_ACTION_OLD_NAME,
+                            mask,
+                            smb_fname_src,
+                            NULL);
+               notify_fname(conn,
+                            NOTIFY_ACTION_NEW_NAME,
+                            mask,
+                            smb_fname_dst,
+                            NULL);
        }
        else {
-               notify_fname(conn, NOTIFY_ACTION_REMOVED, mask,
-                            smb_fname_src->base_name);
-               notify_fname(conn, NOTIFY_ACTION_ADDED, mask,
-                            smb_fname_dst->base_name);
+               notify_fname(conn,
+                            NOTIFY_ACTION_REMOVED,
+                            mask,
+                            smb_fname_src,
+                            NULL);
+               notify_fname(conn,
+                            NOTIFY_ACTION_ADDED,
+                            mask,
+                            smb_fname_dst,
+                            NULL);
        }
 
        /* this is a strange one. w2k3 gives an additional event for
           CHANGE_ATTRIBUTES and CHANGE_CREATION on the new file when renaming
           files, but not directories */
        if (!is_dir) {
-               notify_fname(conn, NOTIFY_ACTION_MODIFIED,
-                            FILE_NOTIFY_CHANGE_ATTRIBUTES
-                            |FILE_NOTIFY_CHANGE_CREATION,
-                            smb_fname_dst->base_name);
+               notify_fname(conn,
+                            NOTIFY_ACTION_MODIFIED,
+                            FILE_NOTIFY_CHANGE_ATTRIBUTES |
+                                    FILE_NOTIFY_CHANGE_CREATION,
+                            smb_fname_dst,
+                            NULL);
        }
  out:
        TALLOC_FREE(parent_dir_src);

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index c0e3b1f54107efb037345eeb3fd9a351afe8b863..0a97493280ba0e5841a912616e7b285b6b835323 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -3907,8 +3907,11 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
                return map_nt_error_from_unix(errno);
        }
 
-       notify_fname(conn, NOTIFY_ACTION_MODIFIED, action,
-                    smb_fname->base_name);
+       notify_fname(conn,
+                    NOTIFY_ACTION_MODIFIED,
+                    action,
+                    smb_fname,
+                    NULL);
        return NT_STATUS_OK;
 }
 

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 16c084dda5181f61f3c1580fd6dbc7a8c3f4c166..baeb20cdeb01cc5f1f7a5bf739553a7ee40ebcde 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -649,10 +649,12 @@ int vfs_set_filelen(files_struct *fsp, off_t len)
        DEBUG(10,("vfs_set_filelen: ftruncate %s to len %.0f\n",
                  fsp_str_dbg(fsp), (double)len));
        if ((ret = SMB_VFS_FTRUNCATE(fsp, len)) != -1) {
-               notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
-                            FILE_NOTIFY_CHANGE_SIZE
-                            | FILE_NOTIFY_CHANGE_ATTRIBUTES,
-                            fsp->fsp_name->base_name);
+               notify_fname(fsp->conn,
+                            NOTIFY_ACTION_MODIFIED,
+                            FILE_NOTIFY_CHANGE_SIZE |
+                                    FILE_NOTIFY_CHANGE_ATTRIBUTES,
+                            fsp->fsp_name,
+                            NULL);
        }
 
        contend_level2_oplocks_end(fsp, LEVEL2_CONTEND_SET_FILE_LEN);