[packages/cyrus-sasl.git] / 0034-fix_dovecot_authentication.patch

--- a/lib/checkpw.c
+++ b/lib/checkpw.c
@@ -587,16 +587,14 @@ static int read_wait(int fd, unsigned de
 	    /* Timeout. */
 	    errno = ETIMEDOUT;
 	    return -1;
-	case +1:
-	    if (FD_ISSET(fd, &rfds)) {
-		/* Success, file descriptor is readable. */
-		return 0;
-	    }
-	    return -1;
 	case -1:
 	    if (errno == EINTR || errno == EAGAIN)
 		continue;
 	default:
+	    if (FD_ISSET(fd, &rfds)) {
+		/* Success, file descriptor is readable. */
+		return 0;
+	    }
 	    /* Error catch-all. */
 	    return -1;
 	}
Commit	Line	Data
c29ea386 JR	1	--- a/lib/checkpw.c
	2	+++ b/lib/checkpw.c
	3	@@ -587,16 +587,14 @@ static int read_wait(int fd, unsigned de
	4	/* Timeout. */
	5	errno = ETIMEDOUT;
	6	return -1;
	7	- case +1:
	8	- if (FD_ISSET(fd, &rfds)) {
	9	- /* Success, file descriptor is readable. */
	10	- return 0;
	11	- }
	12	- return -1;
	13	case -1:
	14	if (errno == EINTR \|\| errno == EAGAIN)
	15	continue;
	16	default:
	17	+ if (FD_ISSET(fd, &rfds)) {
	18	+ /* Success, file descriptor is readable. */
	19	+ return 0;
	20	+ }
	21	/* Error catch-all. */
	22	return -1;
	23	}