diff options
| author | Volker Lendecke <vl@samba.org> | 2014-11-21 16:02:27 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-07-07 23:51:24 +0200 |
| commit | a24f0379aca67bf8126878b8a671964d7d936c1c (patch) | |
| tree | 4a3de0cb2c64d48e75edefb8bdab2e3c7a3b8af6 | |
| parent | e5895c3c37885c3538666bf6cde75881156419cf (diff) | |
| download | samba-a24f0379aca67bf8126878b8a671964d7d936c1c.tar.gz | |
param: Make "kernel change notify" global
With a central notifyd, we can't do this per share anymore. Notifyd will
only look at absolute paths, not shares.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | docs-xml/smbdotconf/misc/kernelchangenotify.xml | 3 | ||||
| -rw-r--r-- | lib/param/param_table.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/docs-xml/smbdotconf/misc/kernelchangenotify.xml b/docs-xml/smbdotconf/misc/kernelchangenotify.xml index 1e11bb8dcd2..6a41dcb2934 100644 --- a/docs-xml/smbdotconf/misc/kernelchangenotify.xml +++ b/docs-xml/smbdotconf/misc/kernelchangenotify.xml @@ -1,7 +1,6 @@ <samba:parameter name="kernel change notify" - context="S" + context="G" type="boolean" - parm="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies whether Samba should ask the diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 9a5881fb82b..0fdd50dad19 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1676,8 +1676,8 @@ struct parm_struct parm_table[] = { { .label = "kernel change notify", .type = P_BOOL, - .p_class = P_LOCAL, - .offset = LOCAL_VAR(kernel_change_notify), + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(kernel_change_notify), .special = NULL, .enum_list = NULL, }, diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 69826348d5c..fcf3de5f7bb 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2151,7 +2151,7 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle, * Until that is the case, hard-code inotify here. */ #ifdef HAVE_INOTIFY - if (lp_kernel_change_notify(vfs_handle->conn->params)) { + if (lp_kernel_change_notify()) { int ret; if (!lp_parm_bool(-1, "notify", "inotify", True)) { return NT_STATUS_INVALID_SYSTEM_SERVICE; diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4228b390ea3..7dd8786ae39 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -239,7 +239,6 @@ static struct loadparm_service sDefault = .acl_map_full_control = true, .acl_group_control = false, .acl_allow_execute_always = false, - .kernel_change_notify = true, .allocation_roundup_size = SMB_ROUNDUP_ALLOCATION_SIZE, .aio_read_size = 0, .aio_write_size = 0, @@ -722,6 +721,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) Globals.hostname_lookups = false; Globals.change_notify = true, + Globals.kernel_change_notify = true, string_set(Globals.ctx, &Globals.passdb_backend, "tdbsam"); string_set(Globals.ctx, &Globals.ldap_suffix, ""); |