[SCM] Samba Shared Repository - branch v3-6-test updated

Jeremy Allison jra at samba.org
Wed Oct 6 17:45:00 MDT 2010


The branch, v3-6-test has been updated
       via  4945535 tevent: Only call handlers that ask for events
      from  bca6ebb idtree: fix right shift of signed ints, crash on large ids on AIX

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


- Log -----------------------------------------------------------------
commit 49455358a2c8ea73c6b6b5b5433e3322ccac43c9
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 6 18:47:08 2010 +0200

    tevent: Only call handlers that ask for events
    
    The s3 libsmbclient puts two different handlers on a single fd for readability
    and writability. With select this works fine, however without this patch we
    unconditionally call the write handler even if the socket is only readable. We
    should have called the read handler instead.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Oct  6 23:40:24 UTC 2010 on sn-devel-104
    (cherry picked from commit 1c9b85667070ee3292862d007f03b33b10713edd)

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

Summary of changes:
 lib/tevent/tevent_standard.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index 1c8ed0e..a68a03c 100644
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -505,7 +505,7 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva
 
 			if (FD_ISSET(fde->fd, &r_fds)) flags |= TEVENT_FD_READ;
 			if (FD_ISSET(fde->fd, &w_fds)) flags |= TEVENT_FD_WRITE;
-			if (flags) {
+			if (flags & fde->flags) {
 				fde->handler(std_ev->ev, fde, flags, fde->private_data);
 				break;
 			}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list