[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2252-g75dfbeb

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  75dfbeb290fb4b9fb479d0c56429767c1a577fe4 (commit)
       via  ca93cd58fabc505a4aac7254d942662ac3340621 (commit)
      from  944d736a0fa47dc92e2f4660e7a3e01d252b3e01 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 75dfbeb290fb4b9fb479d0c56429767c1a577fe4
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Apr 25 16:45:17 2008 +0200

    Revert "Remove a redundant TALLOC_FREE"
    
    This reverts commit 8e348ab8652e1893be78384404f57df1dbbcea48.

commit ca93cd58fabc505a4aac7254d942662ac3340621
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Apr 25 16:43:30 2008 +0200

    Revert "Enable multiple fd events on a single file descriptor"
    
    This reverts commit 61503f822b60f98dd1f7549707ec89b48e32caeb.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events.c           |    2 +-
 source/modules/vfs_aio_fork.c |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/events.c b/source/lib/events.c
index 9decf21..f7bad9b 100644
--- a/source/lib/events.c
+++ b/source/lib/events.c
@@ -292,7 +292,7 @@ bool run_events(struct event_context *event_ctx,
                if (FD_ISSET(fde->fd, read_fds)) flags |= EVENT_FD_READ;
                if (FD_ISSET(fde->fd, write_fds)) flags |= EVENT_FD_WRITE;
 
-               if (flags & fde->flags) {
+               if (flags) {
                        fde->handler(event_ctx, fde, flags, fde->private_data);
                        fired = True;
                }
diff --git a/source/modules/vfs_aio_fork.c b/source/modules/vfs_aio_fork.c
index 7914e8f..28428f2 100644
--- a/source/modules/vfs_aio_fork.c
+++ b/source/modules/vfs_aio_fork.c
@@ -436,6 +436,7 @@ static NTSTATUS create_aio_child(struct aio_child_list 
*children,
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair) == -1) {
                status = map_nt_error_from_unix(errno);
                DEBUG(10, ("socketpair() failed: %s\n", strerror(errno)));
+               TALLOC_FREE(result);
                goto fail;
        }
 


-- 
Samba Shared Repository