diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 19:32:50 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 19:32:50 +0100 |
| commit | a9dbd73b2f1400347bf9db7b6da2020fb5c11494 (patch) | |
| tree | b13b7ff7f9889a84577b355da4afeea860393bf4 | |
| parent | 1e053df95c478dd5ca5fceab822700af49cc6510 (diff) | |
| download | samba-a9dbd73b2f1400347bf9db7b6da2020fb5c11494.tar.gz samba-a9dbd73b2f1400347bf9db7b6da2020fb5c11494.tar.bz2 samba-a9dbd73b2f1400347bf9db7b6da2020fb5c11494.zip | |
Remove last instance of global_loadparm.
| -rw-r--r-- | source4/ntvfs/sysdep/inotify.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index 68653d60bd..c47a1216c8 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -339,10 +339,6 @@ static NTSTATUS inotify_watch(struct sys_notify_context *ctx, /* maybe setup the inotify fd */ if (ctx->private_data == NULL) { NTSTATUS status; - if (!lp_parm_bool(global_loadparm, NULL, "notify", "inotify", true)) { - return NT_STATUS_INVALID_SYSTEM_SERVICE; - } - status = inotify_setup(ctx); NT_STATUS_NOT_OK_RETURN(status); } diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index d84979e44c..a27386bb13 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -71,6 +71,17 @@ _PUBLIC_ struct sys_notify_context *sys_notify_context_create(struct share_confi } for (i=0;i<num_backends;i++) { + char *enable_opt_name; + bool enabled; + + enable_opt_name = talloc_asprintf(mem_ctx, "notify:%s", + backends[i].name); + enabled = share_bool_option(scfg, enable_opt_name, true); + talloc_free(enable_opt_name); + + if (!enabled) + continue; + if (strcasecmp(backends[i].name, bname) == 0) { bname = backends[i].name; break; |