Changeset 342 for branches/samba-3.3.x/source/smbd/notify_inotify.c

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

File:

• branches/samba-3.3.x/source/smbd/notify_inotify.c (modified) (2 diffs)

branches/samba-3.3.x/source/smbd/notify_inotify.c

@@ -233 +233 @@
         struct inotify_event *e0, *e;
         uint32_t prev_cookie=0;
+        NTSTATUS status;
 
         /*
@@ -248 +249 @@
         if (e == NULL) return;
 
-        if (sys_read(in->fd, e0, bufsize) != bufsize) {
-                DEBUG(0,("Failed to read all inotify data\n"));
+        status = read_data(in->fd, (char *)e0, bufsize);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0,("Failed to read all inotify data - %s\n",
+                        nt_errstr(status)));
                 talloc_free(e0);
+                /* the inotify fd will now be out of sync,
+                 * can't keep reading data off it */
+                TALLOC_FREE(fde);
                 return;
         }