diff options
author | Volker Lendecke <vlendec@samba.org> | 2007-02-01 15:11:06 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:39 -0500 |
commit | bad8c39f1ce48229c1ca545c03de6b7c26b7ba9f (patch) | |
tree | 936776b3feaa2c07089c5706af345a50118b1b26 /source3/modules/vfs_default.c | |
parent | 1898eaddb805e86d0c36bd289e7fa61d7bbd4810 (diff) | |
download | samba-bad8c39f1ce48229c1ca545c03de6b7c26b7ba9f.tar.gz samba-bad8c39f1ce48229c1ca545c03de6b7c26b7ba9f.tar.xz samba-bad8c39f1ce48229c1ca545c03de6b7c26b7ba9f.zip |
r21111: Reorganize the change notify params a bit. We now have the per-share
parameters
change notify = [yes]/no # do we do it at all
kernel change notify = [yes]/no # enable/disable inotify
Those who want FAM need to say
change notify = yes
vfs objects = notify_fam
Volker
(This used to be commit c3a44d8b9606fc516faceb69b8e87bfc8be312f3)
Diffstat (limited to 'source3/modules/vfs_default.c')
-rw-r--r-- | source3/modules/vfs_default.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 0efffe154d..458618ee0b 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -842,10 +842,14 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle, void *private_data, void *handle) { #ifdef HAVE_INOTIFY - return inotify_watch(ctx, e, callback, private_data, handle); -#else - return NT_STATUS_OK; + if (lp_kernel_change_notify(ctx->conn->params)) { + return inotify_watch(ctx, e, callback, private_data, handle); + } #endif + /* + * Do nothing, leave everything to notify_internal.c + */ + return NT_STATUS_OK; } static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc) |