svn commit: r220006 - head/sbin/hastd

[Pawel Jakub Dawidek]

Author: pjd
Date: Fri Mar 25 20:15:16 2011
New Revision: 220006
URL: http://svn.freebsd.org/changeset/base/220006

Log:
  Use timeout from configuration file not only when sending and receiving,
  but also when establishing connection.
  
  MFC after:	1 week

Modified:
  head/sbin/hastd/primary.c

Modified: head/sbin/hastd/primary.c
==============================================================================
--- head/sbin/hastd/primary.c	Fri Mar 25 20:13:38 2011	(r220005)
+++ head/sbin/hastd/primary.c	Fri Mar 25 20:15:16 2011	(r220006)
@@ -509,7 +509,7 @@ primary_connect(struct hast_resource *re
 		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);