svn merge -r11322:11325 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

src/common/slurm_protocol_socket_implementation.c

@@ -593,10 +593,14 @@ extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
 	ufds.events = POLLIN | POLLOUT;
 	ufds.revents = 0;
 
-	rc = poll(&ufds, 1, 5000);
+again:	rc = poll(&ufds, 1, 5000);
 	if (rc == -1) {
 		/* poll failed */
-		error("_slurm_connect poll failed: %m");
+		if (errno == EINTR) {
+			verbose("_slurm_connect poll failed: %m");
+			goto again;
+		} else
+			error("_slurm_connect poll failed: %m");
 		return -1;
 	} else if (rc == 0) {
 		/* poll timed out before any socket events */