diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-17 01:19:53 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-17 01:19:53 +0200 |
| commit | c15ffa27cb3a1cadbbf06d564146c1ab8dec952b (patch) | |
| tree | ba3a8091272fa19202e6c543c01d9c4dd29c343b | |
| parent | 06d06c6c9415140167708d09307125067c1f5b87 (diff) | |
| download | samba-c15ffa27cb3a1cadbbf06d564146c1ab8dec952b.tar.gz samba-c15ffa27cb3a1cadbbf06d564146c1ab8dec952b.tar.bz2 samba-c15ffa27cb3a1cadbbf06d564146c1ab8dec952b.zip | |
Explicitly require event context to be specified.
(This used to be commit a95a71fe45ef6a578569931a7c38061783d07db3)
| -rw-r--r-- | source4/ntvfs/common/notify.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index 23aa3fb668..9055d6ece3 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -93,6 +93,10 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, return NULL; } + if (ev == NULL) { + return NULL; + } + notify = talloc(mem_ctx, struct notify_context); if (notify == NULL) { return NULL; diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index eb5cc3793f..22b72c4d63 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -52,7 +52,7 @@ _PUBLIC_ struct sys_notify_context *sys_notify_context_create(struct share_confi } if (ev == NULL) { - ev = event_context_find(mem_ctx); + return NULL; } ctx = talloc_zero(mem_ctx, struct sys_notify_context); |