diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-04-05 04:50:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:00:16 -0500 |
| commit | a9cb173f7674d311624c34205f1417b31972d1f2 (patch) | |
| tree | cab8b6377df9081a03d8805e48ba184fd9b84bf0 /source4/ntvfs/sysdep | |
| parent | 66a0d692564e5392588247696e2156b85252cbea (diff) | |
| download | samba-a9cb173f7674d311624c34205f1417b31972d1f2.tar.gz samba-a9cb173f7674d311624c34205f1417b31972d1f2.tar.bz2 samba-a9cb173f7674d311624c34205f1417b31972d1f2.zip | |
r14918: cleaner handling of systems without inotify
(This used to be commit cf17ff15b15942f0ce068dd0a94b3b565a9b93cb)
Diffstat (limited to 'source4/ntvfs/sysdep')
| -rw-r--r-- | source4/ntvfs/sysdep/inotify.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index 31c408d112..ec8669306e 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -239,7 +239,7 @@ static int watch_destructor(void *ptr) /* add a watch. The watch is removed when the caller calls - talloc_free() on handle + talloc_free() on *handle */ static NTSTATUS inotify_watch(struct sys_notify_context *ctx, const char *dirpath, uint32_t filter, sys_notify_callback_t callback, diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index fd29f42a0e..1927ac61ce 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -44,6 +44,10 @@ struct sys_notify_context *sys_notify_init(int snum, const char *bname; struct sys_notify_backend *b; + if (backends == NULL) { + return NULL; + } + if (ev == NULL) { ev = event_context_find(mem_ctx); } |