r14928: demonstrate that the completion filter is only set on the first notify

on a directory handle
(This used to be commit b6e40d9b0832fbab662f9289a30c26e2576b4821)

diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 2733c59f8c96a1bfe2200fcb018242e28b3dd0a3..ea11a9ff900b79c06fd982c81fd259f823cdcb12 100644 (file)
--- a/source4/ntvfs/posix/pvfs_notify.c
+++ b/source4/ntvfs/posix/pvfs_notify.c
@@ -213,6 +213,8 @@ NTSTATUS pvfs_notify(struct ntvfs_module_context *ntvfs,
                NT_STATUS_NOT_OK_RETURN(status);
        }
 
+       /* we update the max_buffer_size on each call, but we do not
+          update the recursive flag or filter */
        f->notify_buffer->max_buffer_size = info->in.buffer_size;
 
        pending = talloc(f->notify_buffer, struct notify_pending);

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 6f847f5f923fe4665d7b47c46986ae3f49afd42c..467a5a6fffd4a4374280f5f6da838c649b56ae18 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -313,6 +313,7 @@ static BOOL test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        smbcli_rename(cli->tree, BASEDIR "\\subdir-name\\subname2", BASEDIR "\\subname2-r");
        smbcli_rename(cli->tree, BASEDIR "\\subname2-r", BASEDIR "\\subname3-r");
 
+       notify.in.completion_filter = 0;
        notify.in.recursive = True;
        req1 = smb_raw_changenotify_send(cli->tree, &notify);