summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-11 07:56:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:20 -0500
commitc4aaa094e7818e205641a7204a271474c58e453a (patch)
tree57555fcb225c57d00f6e015bb2833ac45aa488a9 /source4
parent35d30de0954eb665c6b900584cbf38212d45752b (diff)
downloadsamba-c4aaa094e7818e205641a7204a271474c58e453a.tar.gz
samba-c4aaa094e7818e205641a7204a271474c58e453a.tar.bz2
samba-c4aaa094e7818e205641a7204a271474c58e453a.zip
r18370: allow system inotify to be disabled
(This used to be commit 31bbf865a069f902dc979f469aec896d3d34422c)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/sysdep/inotify.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c
index 62e9a387a1..a5104a01d0 100644
--- a/source4/ntvfs/sysdep/inotify.c
+++ b/source4/ntvfs/sysdep/inotify.c
@@ -253,6 +253,10 @@ static NTSTATUS inotify_setup(struct sys_notify_context *ctx)
{
struct inotify_private *in;
+ if (!lp_parm_bool(-1, "notify", "inotify", True)) {
+ return NT_STATUS_INVALID_SYSTEM_SERVICE;
+ }
+
in = talloc(ctx, struct inotify_private);
NT_STATUS_HAVE_NO_MEMORY(in);
in->fd = inotify_init();