summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-03-25 20:15:16 +0000
committerpjd <pjd@FreeBSD.org>2011-03-25 20:15:16 +0000
commit7c9a800121ed23c0ea0ea4d33b2370355d4fccba (patch)
tree66139e52342290c6fc3866e2cb2b3b0a96dc45ce /sbin
parentf6f9894d9f38649f73702b3f122ff034eee36dbe (diff)
downloadFreeBSD-src-7c9a800121ed23c0ea0ea4d33b2370355d4fccba.zip
FreeBSD-src-7c9a800121ed23c0ea0ea4d33b2370355d4fccba.tar.gz
Use timeout from configuration file not only when sending and receiving,
but also when establishing connection. MFC after: 1 week
Diffstat (limited to 'sbin')
-rw-r--r--sbin/hastd/primary.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 25322c0..0f4a872 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -509,7 +509,7 @@ primary_connect(struct hast_resource *res, struct proto_conn **connp)
primary_exit(EX_TEMPFAIL,
"Unable to receive connection from parent");
}
- if (proto_connect_wait(conn, HAST_TIMEOUT) < 0) {
+ if (proto_connect_wait(conn, res->hr_timeout) < 0) {
pjdlog_errno(LOG_WARNING, "Unable to connect to %s",
res->hr_remoteaddr);
proto_close(conn);
OpenPOWER on IntegriCloud