s3: Change fsp->fsp_name to be an smb_filename struct!
[samba.git] / source3 / smbd / notify.c
index 674505ac5bc72869f3de35a87d26867ef20819ae..8f37923865bedfaa444490203bfa7b171ae2e57c 100644 (file)
@@ -3,10 +3,11 @@
    change notify handling
    Copyright (C) Andrew Tridgell 2000
    Copyright (C) Jeremy Allison 1994-1998
+   Copyright (C) Volker Lendecke 2007
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "smbd/globals.h"
+
+struct notify_change_request {
+       struct notify_change_request *prev, *next;
+       struct files_struct *fsp;       /* backpointer for cancel by mid */
+       struct smb_request *req;
+       uint32 filter;
+       uint32 max_param;
+       void (*reply_fn)(struct smb_request *req,
+                        NTSTATUS error_code,
+                        uint8_t *buf, size_t len);
+       struct notify_mid_map *mid_map;
+       void *backend_data;
+};
 
-static struct cnotify_fns *cnotify;
-
-/****************************************************************************
- This is the structure to queue to implement NT change
- notify. It consists of smb_size bytes stored from the
- transact command (to keep the mid, tid etc around).
- Plus the fid to examine and notify private data.
-*****************************************************************************/
+static void notify_fsp(files_struct *fsp, uint32 action, const char *name);
 
-struct change_notify {
-       struct change_notify *next, *prev;
-       files_struct *fsp;
-       uint32 flags;
-       uint32 max_param_count;
-       char request_buf[smb_size];
-       void *change_data;
+/*
+ * For NTCancel, we need to find the notify_change_request indexed by
+ * mid. Separate list here.
+ */
+
+struct notify_mid_map {
+       struct notify_mid_map *prev, *next;
+       struct notify_change_request *req;
+       uint16 mid;
 };
 
-static struct change_notify *change_notify_list;
+static bool notify_change_record_identical(struct notify_change *c1,
+                                       struct notify_change *c2)
+{
+       /* Note this is deliberately case sensitive. */
+       if (c1->action == c2->action &&
+                       strcmp(c1->name, c2->name) == 0) {
+               return True;
+       }
+       return False;
+}
 
-static BOOL notify_marshall_changes(struct notify_changes *changes,
-                                   prs_struct *ps)
+static bool notify_marshall_changes(int num_changes,
+                               uint32 max_offset,
+                               struct notify_change *changes,
+                               prs_struct *ps)
 {
        int i;
        UNISTR uni_name;
 
-       for (i=0; i<changes->num_changes; i++) {
-               struct notify_change *c = &changes->changes[i];
+       if (num_changes == -1) {
+               return false;
+       }
+
+       uni_name.buffer = NULL;
+
+       for (i=0; i<num_changes; i++) {
+               struct notify_change *c;
                size_t namelen;
                uint32 u32_tmp; /* Temp arg to prs_uint32 to avoid
                                 * signed/unsigned issues */
 
-               namelen = convert_string_allocate(
-                       NULL, CH_UNIX, CH_UTF16LE, c->name, strlen(c->name)+1,
-                       &uni_name.buffer, True);
-               if ((namelen == -1) || (uni_name.buffer == NULL)) {
+               /* Coalesce any identical records. */
+               while (i+1 < num_changes &&
+                       notify_change_record_identical(&changes[i],
+                                               &changes[i+1])) {
+                       i++;
+               }
+
+               c = &changes[i];
+
+               if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE,
+                       c->name, strlen(c->name)+1, &uni_name.buffer,
+                       &namelen, True) || (uni_name.buffer == NULL)) {
                        goto fail;
                }
 
@@ -66,7 +100,7 @@ static BOOL notify_marshall_changes(struct notify_changes *changes,
                 * Offset to next entry, only if there is one
                 */
 
-               u32_tmp = (i == changes->num_changes-1) ? 0 : namelen + 12;
+               u32_tmp = (i == num_changes-1) ? 0 : namelen + 12;
                if (!prs_uint32("offset", ps, 1, &u32_tmp)) goto fail;
 
                u32_tmp = c->action;
@@ -82,13 +116,21 @@ static BOOL notify_marshall_changes(struct notify_changes *changes,
                 */
                prs_set_offset(ps, prs_offset(ps)-2);
 
-               SAFE_FREE(uni_name.buffer);
+               TALLOC_FREE(uni_name.buffer);
+
+               if (prs_offset(ps) > max_offset) {
+                       /* Too much data for client. */
+                       DEBUG(10, ("Client only wanted %d bytes, trying to "
+                                  "marshall %d bytes\n", (int)max_offset,
+                                  (int)prs_offset(ps)));
+                       return False;
+               }
        }
 
        return True;
 
  fail:
-       SAFE_FREE(uni_name.buffer);
+       TALLOC_FREE(uni_name.buffer);
        return False;
 }
 
@@ -96,416 +138,284 @@ static BOOL notify_marshall_changes(struct notify_changes *changes,
  Setup the common parts of the return packet and send it.
 *****************************************************************************/
 
-static void change_notify_reply_packet(const char *request_buf,
-                                      NTSTATUS error_code)
-{
-       char outbuf[smb_size+38];
-
-       memset(outbuf, '\0', sizeof(outbuf));
-       construct_reply_common(request_buf, outbuf);
-
-       ERROR_NT(error_code);
-
-       /*
-        * Seems NT needs a transact command with an error code
-        * in it. This is a longer packet than a simple error.
-        */
-       set_message(outbuf,18,0,False);
-
-       show_msg(outbuf);
-       if (!send_smb(smbd_server_fd(),outbuf))
-               exit_server_cleanly("change_notify_reply_packet: send_smb failed.");
-}
-
-void change_notify_reply(const char *request_buf, uint32 max_param_count,
-                        files_struct *fsp)
+void change_notify_reply(connection_struct *conn,
+                        struct smb_request *req,
+                        NTSTATUS error_code,
+                        uint32_t max_param,
+                        struct notify_change_buf *notify_buf,
+                        void (*reply_fn)(struct smb_request *req,
+                               NTSTATUS error_code,
+                               uint8_t *buf, size_t len))
 {
-       char *outbuf = NULL;
        prs_struct ps;
-       size_t buflen = smb_size+38+max_param_count;
 
-       if (!prs_init(&ps, 0, NULL, False)
-           || !notify_marshall_changes(fsp->notify, &ps)) {
-               change_notify_reply_packet(request_buf, NT_STATUS_NO_MEMORY);
-               goto done;
+       if (!NT_STATUS_IS_OK(error_code)) {
+               reply_fn(req, error_code, NULL, 0);
+               return;
        }
 
-       if (prs_offset(&ps) > max_param_count) {
+       if (max_param == 0 || notify_buf == NULL) {
+               reply_fn(req, NT_STATUS_OK, NULL, 0);
+               return;
+       }
+
+       prs_init_empty(&ps, NULL, MARSHALL);
+
+       if (!notify_marshall_changes(notify_buf->num_changes, max_param,
+                                       notify_buf->changes, &ps)) {
                /*
                 * We exceed what the client is willing to accept. Send
                 * nothing.
                 */
-               change_notify_reply_packet(request_buf, NT_STATUS_OK);
-               goto done;
+               prs_mem_free(&ps);
+               prs_init_empty(&ps, NULL, MARSHALL);
        }
 
-       if (!(outbuf = SMB_MALLOC_ARRAY(char, buflen))) {
-               change_notify_reply_packet(request_buf, NT_STATUS_NO_MEMORY);
-               goto done;
-       }
-
-       construct_reply_common(request_buf, outbuf);
+       reply_fn(req, NT_STATUS_OK, (uint8_t *)prs_data_p(&ps), prs_offset(&ps));
 
-       if (send_nt_replies(outbuf, buflen, NT_STATUS_OK, prs_data_p(&ps),
-                           prs_offset(&ps), NULL, 0) == -1) {
-               exit_server("change_notify_reply_packet: send_smb failed.");
-       }
-
- done:
-       SAFE_FREE(outbuf);
        prs_mem_free(&ps);
-       fsp->notify->num_changes = 0;
-       TALLOC_FREE(fsp->notify->changes);
-}
 
-/****************************************************************************
- Remove an entry from the list and free it, also closing any
- directory handle if necessary.
-*****************************************************************************/
-
-static void change_notify_remove(struct change_notify *cnbp)
-{
-       cnotify->remove_notify(cnbp->change_data);
-       DLIST_REMOVE(change_notify_list, cnbp);
-       ZERO_STRUCTP(cnbp);
-       SAFE_FREE(cnbp);
+       TALLOC_FREE(notify_buf->changes);
+       notify_buf->num_changes = 0;
 }
 
-/****************************************************************************
- Delete entries by fnum from the change notify pending queue.
-*****************************************************************************/
-
-void remove_pending_change_notify_requests_by_fid(files_struct *fsp, NTSTATUS status)
+static void notify_callback(void *private_data, const struct notify_event *e)
 {
-       struct change_notify *cnbp, *next;
-
-       for (cnbp=change_notify_list; cnbp; cnbp=next) {
-               next=cnbp->next;
-               if (cnbp->fsp->fnum == fsp->fnum) {
-                       change_notify_reply_packet(cnbp->request_buf, status);
-                       change_notify_remove(cnbp);
-               }
-       }
+       files_struct *fsp = (files_struct *)private_data;
+       DEBUG(10, ("notify_callback called for %s\n", fsp_str_dbg(fsp)));
+       notify_fsp(fsp, e->action, e->path);
 }
 
-/****************************************************************************
- Delete entries by mid from the change notify pending queue. Always send reply.
-*****************************************************************************/
-
-void remove_pending_change_notify_requests_by_mid(int mid)
+NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
+                             bool recursive)
 {
-       struct change_notify *cnbp, *next;
-
-       for (cnbp=change_notify_list; cnbp; cnbp=next) {
-               next=cnbp->next;
-               if(SVAL(cnbp->request_buf,smb_mid) == mid) {
-                       change_notify_reply_packet(cnbp->request_buf,
-                                                  NT_STATUS_CANCELLED);
-                       change_notify_remove(cnbp);
-               }
-       }
-}
-
-/****************************************************************************
- Delete entries by filename and cnum from the change notify pending queue.
- Always send reply.
-*****************************************************************************/
+       char *fullpath;
+       struct notify_entry e;
+       NTSTATUS status;
 
-void remove_pending_change_notify_requests_by_filename(files_struct *fsp, NTSTATUS status)
-{
-       struct change_notify *cnbp, *next;
+       SMB_ASSERT(fsp->notify == NULL);
 
-       for (cnbp=change_notify_list; cnbp; cnbp=next) {
-               next=cnbp->next;
-               /*
-                * We know it refers to the same directory if the connection number and
-                * the filename are identical.
-                */
-               if((cnbp->fsp->conn == fsp->conn) && strequal(cnbp->fsp->fsp_name,fsp->fsp_name)) {
-                       change_notify_reply_packet(cnbp->request_buf, status);
-                       change_notify_remove(cnbp);
-               }
+       if (!(fsp->notify = TALLOC_ZERO_P(NULL, struct notify_change_buf))) {
+               DEBUG(0, ("talloc failed\n"));
+               return NT_STATUS_NO_MEMORY;
        }
-}
 
-/****************************************************************************
- Set the current change notify timeout to the lowest value across all service
- values.
-****************************************************************************/
-
-void set_change_notify_timeout(int val)
-{
-       if (val > 0) {
-               cnotify->select_time = MIN(cnotify->select_time, val);
+       /* Do notify operations on the base_name. */
+       if (asprintf(&fullpath, "%s/%s", fsp->conn->connectpath,
+                    fsp->fsp_name->base_name) == -1) {
+               DEBUG(0, ("asprintf failed\n"));
+               TALLOC_FREE(fsp->notify);
+               return NT_STATUS_NO_MEMORY;
        }
-}
-
-/****************************************************************************
- Longest time to sleep for before doing a change notify scan.
-****************************************************************************/
 
-int change_notify_timeout(void)
-{
-       return cnotify->select_time;
-}
-
-/****************************************************************************
- Process the change notify queue. Note that this is only called as root.
- Returns True if there are still outstanding change notify requests on the
- queue.
-*****************************************************************************/
-
-BOOL process_pending_change_notify_queue(time_t t)
-{
-       struct change_notify *cnbp, *next;
-       uint16 vuid;
-
-       for (cnbp=change_notify_list; cnbp; cnbp=next) {
-               next=cnbp->next;
-
-               vuid = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID : SVAL(cnbp->request_buf,smb_uid);
-
-               if (cnbp->fsp->notify->num_changes != 0) {
-                       DEBUG(10,("process_pending_change_notify_queue: %s "
-                                 "has %d changes!\n", cnbp->fsp->fsp_name,
-                                 cnbp->fsp->notify->num_changes));
-                       change_notify_reply(cnbp->request_buf,
-                                           cnbp->max_param_count,
-                                           cnbp->fsp);
-                       change_notify_remove(cnbp);
-                       continue;
-               }
-
-               if (cnotify->check_notify(cnbp->fsp->conn, vuid,
-                                         cnbp->fsp->fsp_name, cnbp->flags,
-                                         cnbp->change_data, t)) {
-                       DEBUG(10,("process_pending_change_notify_queue: dir "
-                                 "%s changed !\n", cnbp->fsp->fsp_name ));
-                       change_notify_reply(cnbp->request_buf,
-                                           cnbp->max_param_count,
-                                           cnbp->fsp);
-                       change_notify_remove(cnbp);
-               }
+       ZERO_STRUCT(e);
+       e.path = fullpath;
+       e.dir_fd = fsp->fh->fd;
+       e.dir_id = fsp->file_id;
+       e.filter = filter;
+       e.subdir_filter = 0;
+       if (recursive) {
+               e.subdir_filter = filter;
        }
 
-       return (change_notify_list != NULL);
+       status = notify_add(fsp->conn->notify_ctx, &e, notify_callback, fsp);
+       SAFE_FREE(fullpath);
+
+       return status;
 }
 
-/****************************************************************************
- Now queue an entry on the notify change list.
- We only need to save smb_size bytes from this incoming packet
- as we will always by returning a 'read the directory yourself'
- error.
-****************************************************************************/
-
-BOOL change_notify_set(char *inbuf, files_struct *fsp, connection_struct *conn,
-                      uint32 flags, uint32 max_param_count)
+NTSTATUS change_notify_add_request(struct smb_request *req,
+                               uint32 max_param,
+                               uint32 filter, bool recursive,
+                               struct files_struct *fsp,
+                               void (*reply_fn)(struct smb_request *req,
+                                       NTSTATUS error_code,
+                                       uint8_t *buf, size_t len))
 {
-       struct change_notify *cnbp;
+       struct notify_change_request *request = NULL;
+       struct notify_mid_map *map = NULL;
+       struct smbd_server_connection *sconn = smbd_server_conn;
 
-       if((cnbp = SMB_MALLOC_P(struct change_notify)) == NULL) {
-               DEBUG(0,("change_notify_set: malloc fail !\n" ));
-               return False;
-       }
+       DEBUG(10, ("change_notify_add_request: Adding request for %s: "
+                  "max_param = %d\n", fsp_str_dbg(fsp), (int)max_param));
 
-       ZERO_STRUCTP(cnbp);
-
-       memcpy(cnbp->request_buf, inbuf, smb_size);
-       cnbp->fsp = fsp;
-       cnbp->flags = flags;
-       cnbp->max_param_count = max_param_count;
-       cnbp->change_data = cnotify->register_notify(conn, fsp->fsp_name,
-                                                    flags);
-       
-       if (!cnbp->change_data) {
-               SAFE_FREE(cnbp);
-               return False;
+       if (!(request = talloc(NULL, struct notify_change_request))
+           || !(map = talloc(request, struct notify_mid_map))) {
+               TALLOC_FREE(request);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       DLIST_ADD(change_notify_list, cnbp);
+       request->mid_map = map;
+       map->req = request;
 
-       /* Push the MID of this packet on the signing queue. */
-       srv_defer_sign_response(SVAL(inbuf,smb_mid));
+       request->req = talloc_move(request, &req);
+       request->max_param = max_param;
+       request->filter = filter;
+       request->fsp = fsp;
+       request->reply_fn = reply_fn;
+       request->backend_data = NULL;
 
-       return True;
-}
+       DLIST_ADD_END(fsp->notify->requests, request,
+                     struct notify_change_request *);
 
-int change_notify_fd(void)
-{
-       if (cnotify) {
-               return cnotify->notification_fd;
-       }
+       map->mid = request->req->mid;
+       DLIST_ADD(sconn->smb1.notify_mid_maps, map);
 
-       return -1;
+       return NT_STATUS_OK;
 }
 
-/* notify message definition
-
-Offset  Data                   length.
-0      SMB_DEV_T dev           8
-8      SMB_INO_T inode         8
-16     uint32 action           4
-20..   name
-*/
-
-#define MSG_NOTIFY_MESSAGE_SIZE 21 /* Includes at least the '\0' terminator */
-
-struct notify_message {
-       SMB_DEV_T dev;
-       SMB_INO_T inode;
-       uint32_t action;
-       char *name;
-};
-
-static DATA_BLOB notify_message_to_buf(const struct notify_message *msg)
+static void change_notify_remove_request(struct notify_change_request *remove_req)
 {
-       DATA_BLOB result;
-       size_t len;
-
-       len = strlen(msg->name);
+       files_struct *fsp;
+       struct notify_change_request *req;
+       struct smbd_server_connection *sconn = smbd_server_conn;
 
-       result = data_blob(NULL, MSG_NOTIFY_MESSAGE_SIZE + len);
-       if (!result.data) {
-               return result;
-       }
+       /*
+        * Paranoia checks, the fsp referenced must must have the request in
+        * its list of pending requests
+        */
 
-       SDEV_T_VAL(result.data, 0, msg->dev);
-       SINO_T_VAL(result.data, 8, msg->inode);
-       SIVAL(result.data, 16, msg->action);
-       memcpy(result.data+20, msg->name, len+1);
+       fsp = remove_req->fsp;
+       SMB_ASSERT(fsp->notify != NULL);
 
-       return result;
-}
+       for (req = fsp->notify->requests; req; req = req->next) {
+               if (req == remove_req) {
+                       break;
+               }
+       }
 
-static BOOL buf_to_notify_message(void *buf, size_t len,
-                                 struct notify_message *msg)
-{
-       if (len < MSG_NOTIFY_MESSAGE_SIZE) {
-               DEBUG(0, ("Got invalid notify message of len %d\n", len));
-               return False;
+       if (req == NULL) {
+               smb_panic("notify_req not found in fsp's requests");
        }
 
-       msg->dev     = DEV_T_VAL(buf, 0);
-       msg->inode   = INO_T_VAL(buf, 8);
-       msg->action  = IVAL(buf, 16);
-       msg->name    = ((char *)buf)+20;
-       return True;
+       DLIST_REMOVE(fsp->notify->requests, req);
+       DLIST_REMOVE(sconn->smb1.notify_mid_maps, req->mid_map);
+       TALLOC_FREE(req);
 }
 
-void notify_action(connection_struct *conn, const char *parent,
-                  const char *name, uint32_t action)
-{
-       struct share_mode_lock *lck;
-       SMB_STRUCT_STAT sbuf;
-       int i;
-       struct notify_message msg;
-       DATA_BLOB blob;
-
-       struct process_id *pids;
-       int num_pids;
+/****************************************************************************
+ Delete entries by mid from the change notify pending queue. Always send reply.
+*****************************************************************************/
 
-       DEBUG(10, ("notify_action: parent=%s, name=%s, action=%u\n",
-                  parent, name, (unsigned)action));
+void remove_pending_change_notify_requests_by_mid(uint16 mid)
+{
+       struct notify_mid_map *map;
+       struct smbd_server_connection *sconn = smbd_server_conn;
 
-       if (SMB_VFS_STAT(conn, parent, &sbuf) != 0) {
-               /*
-                * Not 100% critical, ignore failure
-                */
-               return;
+       for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
+               if (map->mid == mid) {
+                       break;
+               }
        }
 
-       if (!(lck = get_share_mode_lock(NULL, sbuf.st_dev, sbuf.st_ino,
-                                       NULL, NULL))) {
+       if (map == NULL) {
                return;
        }
 
-       msg.dev = sbuf.st_dev;
-       msg.inode = sbuf.st_ino;
-       msg.action = action;
-       msg.name = CONST_DISCARD(char *, name);
+       change_notify_reply(map->req->fsp->conn, map->req->req,
+                           NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
+       change_notify_remove_request(map->req);
+}
+
+/****************************************************************************
+ Delete entries by fnum from the change notify pending queue.
+*****************************************************************************/
 
-       blob = notify_message_to_buf(&msg);
-       if (blob.data == NULL) {
-               DEBUG(0, ("notify_message_to_buf failed\n"));
+void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
+                                                 NTSTATUS status)
+{
+       if (fsp->notify == NULL) {
                return;
        }
 
-       pids = NULL;
-       num_pids = 0;
-
-       become_root_uid_only();
-
-       for (i=0; i<lck->num_share_modes; i++) {
-               struct share_mode_entry *e = &lck->share_modes[i];
-               int j;
-               struct process_id *tmp;
+       while (fsp->notify->requests != NULL) {
+               change_notify_reply(fsp->conn, fsp->notify->requests->req,
+                                   status, 0, NULL,
+                                   fsp->notify->requests->reply_fn);
+               change_notify_remove_request(fsp->notify->requests);
+       }
+}
 
-               for (j=0; j<num_pids; j++) {
-                       if (procid_equal(&e->pid, &pids[j])) {
-                               break;
-                       }
-               }
+void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
+                 const char *path)
+{
+       char *fullpath;
+       char *parent;
+       const char *name;
 
-               if (j < num_pids) {
-                       /*
-                        * Already sent to that process, skip it
-                        */
-                       continue;
+       if (path[0] == '.' && path[1] == '/') {
+               path += 2;
+       }
+       if (parent_dirname(talloc_tos(), path, &parent, &name)) {
+               struct smb_filename *smb_fname_parent = NULL;
+               NTSTATUS status;
+
+               status = create_synthetic_smb_fname(talloc_tos(), parent, NULL,
+                                                   NULL, &smb_fname_parent);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return;
                }
-
-               message_send_pid(lck->share_modes[i].pid, MSG_SMB_NOTIFY,
-                                blob.data, blob.length, True);
-
-               if (!(tmp = TALLOC_REALLOC_ARRAY(lck, pids, struct process_id,
-                                                num_pids+1))) {
-                       DEBUG(0, ("realloc failed\n"));
-                       break;
+               if (SMB_VFS_STAT(conn, smb_fname_parent) != -1) {
+                       notify_onelevel(conn->notify_ctx, action, filter,
+                           SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent->st),
+                           name);
                }
-               pids = tmp;
-               pids[num_pids] = e->pid;
-               num_pids += 1;
+               TALLOC_FREE(smb_fname_parent);
        }
 
-       unbecome_root_uid_only();
-
-       data_blob_free(&blob);
-       TALLOC_FREE(lck);
+       fullpath = talloc_asprintf(talloc_tos(), "%s/%s", conn->connectpath,
+                                  path);
+       if (fullpath == NULL) {
+               DEBUG(0, ("asprintf failed\n"));
+               return;
+       }
+       notify_trigger(conn->notify_ctx, action, filter, fullpath);
+       TALLOC_FREE(fullpath);
 }
 
-static void notify_message_callback(int msgtype, struct process_id pid,
-                                   void *buf, size_t len)
+static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
 {
-       struct notify_message msg;
-       files_struct *fsp;
-       struct notify_change *changes, *change;
-       struct change_notify *cnbp;
+       struct notify_change *change, *changes;
+       char *tmp;
 
-       if (!buf_to_notify_message(buf, len, &msg)) {
+       if (fsp->notify == NULL) {
+               /*
+                * Nobody is waiting, don't queue
+                */
                return;
        }
 
-       DEBUG(10, ("Received notify_message for 0x%x/%.0f: %d\n",
-                  (unsigned)msg.dev, (double)msg.inode, msg.action));
-
-       fsp = NULL;
+       /*
+        * Someone has triggered a notify previously, queue the change for
+        * later.
+        */
 
-       for (cnbp = change_notify_list; cnbp != NULL; cnbp = cnbp->next) {
-               if ((cnbp->fsp->dev == msg.dev)
-                   && (cnbp->fsp->inode == msg.inode)) {
-                       break;
+       if ((fsp->notify->num_changes > 1000) || (name == NULL)) {
+               /*
+                * The real number depends on the client buf, just provide a
+                * guard against a DoS here.  If name == NULL the CN backend is
+                * alerting us to a problem.  Possibly dropped events.  Clear
+                * queued changes and send the catch-all response to the client
+                * if a request is pending.
+                */
+               TALLOC_FREE(fsp->notify->changes);
+               fsp->notify->num_changes = -1;
+               if (fsp->notify->requests != NULL) {
+                       change_notify_reply(fsp->conn,
+                                           fsp->notify->requests->req,
+                                           NT_STATUS_OK,
+                                           fsp->notify->requests->max_param,
+                                           fsp->notify,
+                                           fsp->notify->requests->reply_fn);
+                       change_notify_remove_request(fsp->notify->requests);
                }
+               return;
        }
 
-       if (cnbp != NULL) {
-               DEBUG(10, ("Found pending change notify for %s\n",
-                          cnbp->fsp->fsp_name));
-               fsp = cnbp->fsp;
-               SMB_ASSERT(fsp->notify->num_changes == 0);
-       }
-
-       if ((fsp == NULL)
-           && !(fsp = file_find_dir_lowest_id(msg.dev, msg.inode))) {
-               DEBUG(10, ("notify_message: did not find fsp\n"));
+       /* If we've exceeded the server side queue or received a NULL name
+        * from the underlying CN implementation, don't queue up any more
+        * requests until we can send a catch-all response to the client */
+       if (fsp->notify->num_changes == -1) {
                return;
        }
 
@@ -520,50 +430,111 @@ static void notify_message_callback(int msgtype, struct process_id pid,
 
        change = &(fsp->notify->changes[fsp->notify->num_changes]);
 
-       if (!(change->name = talloc_strdup(changes, msg.name))) {
+       if (!(tmp = talloc_strdup(changes, name))) {
                DEBUG(0, ("talloc_strdup failed\n"));
                return;
        }
-       change->action = msg.action;
+
+       string_replace(tmp, '/', '\\');
+       change->name = tmp;     
+
+       change->action = action;
        fsp->notify->num_changes += 1;
 
-       if (cnbp != NULL) {
+       if (fsp->notify->requests == NULL) {
                /*
-                * Respond directly, we have a someone waiting for this change
+                * Nobody is waiting, so don't send anything. The ot
                 */
-               DEBUG(10, ("Found pending cn for %s, responding directly\n",
-                          cnbp->fsp->fsp_name));
-               change_notify_reply(cnbp->request_buf, cnbp->max_param_count,
-                                   cnbp->fsp);
-               change_notify_remove(cnbp);
                return;
        }
+
+       if (action == NOTIFY_ACTION_OLD_NAME) {
+               /*
+                * We have to send the two rename events in one reply. So hold
+                * the first part back.
+                */
+               return;
+       }
+
+       /*
+        * Someone is waiting for the change, trigger the reply immediately.
+        *
+        * TODO: do we have to walk the lists of requests pending?
+        */
+
+       change_notify_reply(fsp->conn,
+                           fsp->notify->requests->req,
+                           NT_STATUS_OK,
+                           fsp->notify->requests->max_param,
+                           fsp->notify,
+                           fsp->notify->requests->reply_fn);
+
+       change_notify_remove_request(fsp->notify->requests);
 }
 
-/****************************************************************************
- Initialise the change notify subsystem.
-****************************************************************************/
+char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)
+{
+       char *result = NULL;
+
+       result = talloc_strdup(mem_ctx, "");
+
+       if (filter & FILE_NOTIFY_CHANGE_FILE_NAME)
+               result = talloc_asprintf_append(result, "FILE_NAME|");
+       if (filter & FILE_NOTIFY_CHANGE_DIR_NAME)
+               result = talloc_asprintf_append(result, "DIR_NAME|");
+       if (filter & FILE_NOTIFY_CHANGE_ATTRIBUTES)
+               result = talloc_asprintf_append(result, "ATTRIBUTES|");
+       if (filter & FILE_NOTIFY_CHANGE_SIZE)
+               result = talloc_asprintf_append(result, "SIZE|");
+       if (filter & FILE_NOTIFY_CHANGE_LAST_WRITE)
+               result = talloc_asprintf_append(result, "LAST_WRITE|");
+       if (filter & FILE_NOTIFY_CHANGE_LAST_ACCESS)
+               result = talloc_asprintf_append(result, "LAST_ACCESS|");
+       if (filter & FILE_NOTIFY_CHANGE_CREATION)
+               result = talloc_asprintf_append(result, "CREATION|");
+       if (filter & FILE_NOTIFY_CHANGE_EA)
+               result = talloc_asprintf_append(result, "EA|");
+       if (filter & FILE_NOTIFY_CHANGE_SECURITY)
+               result = talloc_asprintf_append(result, "SECURITY|");
+       if (filter & FILE_NOTIFY_CHANGE_STREAM_NAME)
+               result = talloc_asprintf_append(result, "STREAM_NAME|");
+       if (filter & FILE_NOTIFY_CHANGE_STREAM_SIZE)
+               result = talloc_asprintf_append(result, "STREAM_SIZE|");
+       if (filter & FILE_NOTIFY_CHANGE_STREAM_WRITE)
+               result = talloc_asprintf_append(result, "STREAM_WRITE|");
+
+       if (result == NULL) return NULL;
+       if (*result == '\0') return result;
+
+       result[strlen(result)-1] = '\0';
+       return result;
+}
 
-BOOL init_change_notify(void)
+struct sys_notify_context *sys_notify_context_create(connection_struct *conn,
+                                                    TALLOC_CTX *mem_ctx, 
+                                                    struct event_context *ev)
 {
-       cnotify = NULL;
-
-#if HAVE_KERNEL_CHANGE_NOTIFY
-       if (cnotify == NULL && lp_kernel_change_notify())
-               cnotify = kernel_notify_init();
-#endif
-#if HAVE_FAM_CHANGE_NOTIFY
-       if (cnotify == NULL && lp_fam_change_notify())
-               cnotify = fam_notify_init();
-#endif
-       if (!cnotify) cnotify = hash_notify_init();
-       
-       if (!cnotify) {
-               DEBUG(0,("Failed to init change notify system\n"));
-               return False;
+       struct sys_notify_context *ctx;
+
+       if (!(ctx = TALLOC_P(mem_ctx, struct sys_notify_context))) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
        }
 
-       message_register(MSG_SMB_NOTIFY, notify_message_callback);
+       ctx->ev = ev;
+       ctx->conn = conn;
+       ctx->private_data = NULL;
+       return ctx;
+}
 
-       return True;
+NTSTATUS sys_notify_watch(struct sys_notify_context *ctx,
+                         struct notify_entry *e,
+                         void (*callback)(struct sys_notify_context *ctx, 
+                                          void *private_data,
+                                          struct notify_event *ev),
+                         void *private_data, void *handle)
+{
+       return SMB_VFS_NOTIFY_WATCH(ctx->conn, ctx, e, callback, private_data,
+                                   handle);
 }
+