sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Fix ETIME handling for Solaris event ports.

Browse Source 
It is possible for port_getn to return -1 with errno set to ETIME and
still return events. If those events aren't processed the association is
lost by samba since the kernel dissacociated them and samba never
processed them so never reassociated them with the event port. The
patch checks the nget return value in the case of ETIME and if it is non
0 it doesn't return and goes through the event processing loop.

Signed-off-by: Nathan Huff <nhuff@acm.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Sun Feb  7 11:26:35 CET 2016 on sn-devel-144
This commit is contained in:
Nathan Huff 2016-02-05 13:35:07 -07:00 committed by Ralph Boehme
parent 1f6495b2f5
commit 4953b1f73f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/tevent/tevent_port.c
View File

@ -496,10 +496,24 @@ static int port_event_loop(struct port_event_context *port_ev, struct timeval *t
return 0;
}
if (ret == -1 && port_errno == ETIME && tvalp) {
/* we don't care about a possible delay here */
tevent_common_loop_timer_delay(ev);
return 0;
if (ret == -1 && port_errno == ETIME) {
/*
* If errno is set to ETIME it is possible that we still got an event.
* In that case we need to go through the processing loop so that we
* reassociate the received event with the port or the association will
* be lost so check the value of nget is 0 before returning.
*/
if (nget == 0) {
/* we don't care about a possible delay here */
tevent_common_loop_timer_delay(ev);
return 0;
}
/*
* Set the return value to 0 since we do not actually have an error and we
* do have events that need to be processed. This keeps us from getting
* caught in the generic error test.
*/
ret = 0;
}
if (ret == -1) {