[SCM] Samba Shared Repository - branch v4-2-test updated

[Stefan Metzmacher]

The branch, v4-2-test has been updated
       via  1309af4 tevent: version 0.9.24
       via  5db8d19 tevent: Ignore unexpected signal events in the same way the epoll backend does.
      from  7ad61f9 backupkey: Explain more why we use GnuTLS here

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 1309af4880eb00cf127aa3c1fc7b590c7000a4ec
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Mar 3 23:58:09 2015 +0100

    tevent: version 0.9.24
    
    * Ignore unsolicited signal wakeup in tevent_port event loop.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Mar  4 08:33:06 CET 2015 on sn-devel-104
    
    (cherry picked from commit 89788dd3193633f5e88ff194219ad838dcdfab96)
    
    Autobuild-User(v4-2-test): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(v4-2-test): Wed Mar  4 15:07:48 CET 2015 on sn-devel-104

commit 5db8d198ad7045d6bcb8e41701d045e92405c108
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Mar 2 16:17:54 2015 -0800

    tevent: Ignore unexpected signal events in the same way the epoll backend does.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11118
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Tue Mar  3 17:33:06 CET 2015 on sn-devel-104
    
    (cherry picked from commit 7be3a5f92ddbb378a3c80e455cb7403f7861efa1)

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

Summary of changes:
 lib/tevent/ABI/{tevent-0.9.21.sigs => tevent-0.9.24.sigs} |  0
 lib/tevent/tevent_port.c                                  | 12 +++++++++---
 lib/tevent/wscript                                        |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
 copy lib/tevent/ABI/{tevent-0.9.21.sigs => tevent-0.9.24.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/ABI/tevent-0.9.21.sigs b/lib/tevent/ABI/tevent-0.9.24.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.21.sigs
copy to lib/tevent/ABI/tevent-0.9.24.sigs
diff --git a/lib/tevent/tevent_port.c b/lib/tevent/tevent_port.c
index 93e94b2..dd4958e 100644
--- a/lib/tevent/tevent_port.c
+++ b/lib/tevent/tevent_port.c
@@ -483,10 +483,16 @@ static int port_event_loop(struct port_event_context *port_ev, struct timeval *t
 	port_errno = errno;
 	tevent_trace_point_callback(ev, TEVENT_TRACE_AFTER_WAIT);
 
-	if (ret == -1 && port_errno == EINTR && ev->signal_events) {
-		if (tevent_common_check_signal(ev)) {
-			return 0;
+	if (ret == -1 && port_errno == EINTR) {
+		if (ev->signal_events) {
+			tevent_common_check_signal(ev);
 		}
+		/*
+		 * If no signal handlers we got an unsolicited
+		 * signal wakeup. This can happen with epoll
+		 * too. Just return and ignore.
+		 */
+		return 0;
 	}
 
 	if (ret == -1 && port_errno == ETIME && tvalp) {
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 489ce31..0da8232 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tevent'
-VERSION = '0.9.23'
+VERSION = '0.9.24'
 
 blddir = 'bin'
 


-- 
Samba Shared Repository