From e4692ffe5b8d39e89f45fcd48ecb75fb75b1734d Mon Sep 17 00:00:00 2001
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 30 Oct 2009 13:02:08 +0000
Subject: [PATCH] MFC rev. 197621: Fix bug, when RADIUS client gave up after
 single sendto() error, do not trying backup servers.

PR:		kern/103764, misc/139214
---
 lib/libradius/radlib.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index 8faaf7e12a6..e4e4a941180 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -650,17 +650,12 @@ rad_continue_send_request(struct rad_handle *h, int selected, int *fd,
 	n = sendto(h->fd, h->out, h->out_len, 0,
 	    (const struct sockaddr *)&h->servers[h->srv].addr,
 	    sizeof h->servers[h->srv].addr);
-	if (n != h->out_len) {
-		if (n == -1)
-			generr(h, "sendto: %s", strerror(errno));
-		else
-			generr(h, "sendto: short write");
-		return -1;
-	}
-
+	if (n != h->out_len)
+		tv->tv_sec = 1; /* Do not wait full timeout if send failed. */
+	else
+		tv->tv_sec = h->servers[h->srv].timeout;
 	h->try++;
 	h->servers[h->srv].num_tries++;
-	tv->tv_sec = h->servers[h->srv].timeout;
 	tv->tv_usec = 0;
 	*fd = h->fd;