From owner-cvs-src-old@FreeBSD.ORG  Wed Jan 12 14:14:00 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D194F106579A
	for <cvs-src-old@freebsd.org>; Wed, 12 Jan 2011 14:14:00 +0000 (UTC)
	(envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BF69B8FC0A
	for <cvs-src-old@freebsd.org>; Wed, 12 Jan 2011 14:14:00 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p0CEE0B2071027
	for <cvs-src-old@freebsd.org>; Wed, 12 Jan 2011 14:14:00 GMT
	(envelope-from pjd@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p0CEE0nU071026
	for cvs-src-old@freebsd.org; Wed, 12 Jan 2011 14:14:00 GMT
	(envelope-from pjd@repoman.freebsd.org)
Message-Id: <201101121414.p0CEE0nU071026@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	pjd@repoman.freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 12 Jan 2011 14:13:50 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sbin/hastd Makefile primary.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jan 2011 14:14:00 -0000

pjd         2011-01-12 14:13:50 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sbin/hastd           Makefile primary.c 
  Log:
  SVN rev 217306 on 2011-01-12 14:13:50Z by pjd
  
  svn merge -c215331,215332,215676 svn+ssh://svn.freebsd.org/base/head/sbin/hastd sbin/hastd
  
  MFC r215331,r215332,r215676:
  
  r215676 (by brucec):
  
  Don't generate input() since it's not used.
  
  r215332:
  
  Move timeout.tv_sec initialization outside the loop - sigtimedwait(2) won't
  modify it.
  
  Submitted by:   Mikolaj Golub <to.my.trociny@gmail.com>
  
  r215331:
  
  1. Exit when we cannot create incoming connection.
  2. Improve logging to inform which connection can't be created.
  
  Submitted by:   [1] Mikolaj Golub <to.my.trociny@gmail.com>
  
  Revision  Changes    Path
  1.3.2.6   +1 -0      src/sbin/hastd/Makefile
  1.3.2.10  +5 -3      src/sbin/hastd/primary.c