瀏覽代碼

Resolves: #237731
Summary: Random SASL GSSAPI test failure on shadowfoot (Comment #9)

Noriko Hosoi 18 年之前
父節點
當前提交
5b23a738b3
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      ldap/servers/slapd/connection.c

+ 2 - 1
ldap/servers/slapd/connection.c

@@ -1745,8 +1745,9 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
 			}
 			}
 			/* err = PR_GetError(); */
 			/* err = PR_GetError(); */
 			/* If we would block, we need to poll for a while */
 			/* If we would block, we need to poll for a while */
+			syserr = PR_GetOSError();
 			if ( SLAPD_PR_WOULD_BLOCK_ERROR( err ) ||
 			if ( SLAPD_PR_WOULD_BLOCK_ERROR( err ) ||
-			     SLAPD_SYSTEM_WOULD_BLOCK_ERROR( err ) ) {
+			     SLAPD_SYSTEM_WOULD_BLOCK_ERROR( syserr ) ) {
 				struct PRPollDesc	pr_pd;
 				struct PRPollDesc	pr_pd;
 				PRIntervalTime	timeout = PR_MillisecondsToInterval(CONN_TURBO_TIMEOUT_INTERVAL);
 				PRIntervalTime	timeout = PR_MillisecondsToInterval(CONN_TURBO_TIMEOUT_INTERVAL);
 				pr_pd.fd = (PRFileDesc *)conn->c_prfd;
 				pr_pd.fd = (PRFileDesc *)conn->c_prfd;