diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2007-02-19 21:56:08 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2007-02-19 21:56:08 +0000 |
| commit | 5b5a05f59ba9dddef697c8a6715773858ec9ce4e (patch) | |
| tree | d622b032d183d5c2ee17753d2d4110c67e712332 /net-misc/openntpd/files | |
| parent | 2.1.2-r10 revbump. (diff) | |
| download | gentoo-2-5b5a05f59ba9dddef697c8a6715773858ec9ce4e.tar.gz gentoo-2-5b5a05f59ba9dddef697c8a6715773858ec9ce4e.tar.bz2 gentoo-2-5b5a05f59ba9dddef697c8a6715773858ec9ce4e.zip | |
add patch to fix bug #122912
(Portage version: 2.1.1-r2)
Diffstat (limited to 'net-misc/openntpd/files')
| -rw-r--r-- | net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 | 3 | ||||
| -rw-r--r-- | net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff | 43 |
2 files changed, 46 insertions, 0 deletions
diff --git a/net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 b/net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 new file mode 100644 index 000000000000..0fd0491f53c8 --- /dev/null +++ b/net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 @@ -0,0 +1,3 @@ +MD5 afc34175f38d08867c1403d9008600b3 openntpd-3.9p1.tar.gz 152700 +RMD160 c348004116c78810daa9451f15abcc26788949a8 openntpd-3.9p1.tar.gz 152700 +SHA256 83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49 openntpd-3.9p1.tar.gz 152700 diff --git a/net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff b/net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff new file mode 100644 index 000000000000..adca55614a49 --- /dev/null +++ b/net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff @@ -0,0 +1,43 @@ +diff -Naur openntpd-3.9p1/client.c openntpd-3.9p1-fixed/client.c +--- openntpd-3.9p1/client.c 2006-05-14 07:29:21.000000000 +0200 ++++ openntpd-3.9p1-fixed/client.c 2006-10-11 02:41:44.000000000 +0200 +@@ -116,6 +116,7 @@ + client_query(struct ntp_peer *p) + { + int tos = IPTOS_LOWDELAY; ++ int result; + + if (p->addr == NULL && client_nextaddr(p) == -1) { + set_next(p, error_interval()); +@@ -163,9 +164,17 @@ + p->query->msg.xmttime.fractionl = arc4random(); + p->query->xmttime = gettime(); + +- if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg, +- NTP_MSGSIZE_NOAUTH, 0) == -1) { ++ if ((result = ntp_sendmsg(p->query->fd, NULL, &p->query->msg, ++ NTP_MSGSIZE_NOAUTH, 0)) < 0) { + set_next(p, INTERVAL_QUERY_PATHETIC); ++ if (result == -2) { ++ /* ++ * got EINVAL in sendto(), probably the local socket ++ * address got invalidated -> force re-connect() ++ */ ++ close(p->query->fd); ++ p->query->fd = -1; ++ } + return (-1); + } + +diff -Naur openntpd-3.9p1/ntp_msg.c openntpd-3.9p1-fixed/ntp_msg.c +--- openntpd-3.9p1/ntp_msg.c 2006-05-14 07:29:21.000000000 +0200 ++++ openntpd-3.9p1-fixed/ntp_msg.c 2006-10-11 02:41:49.000000000 +0200 +@@ -98,6 +98,8 @@ + return (-1); + } + log_warn("sendto"); ++ if (errno == EINVAL) ++ return (-2); + return (-1); + } + |