From owner-svn-src-head@FreeBSD.ORG  Wed Feb  9 08:01:10 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0DE7106564A;
	Wed,  9 Feb 2011 08:01:10 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF8088FC0C;
	Wed,  9 Feb 2011 08:01:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1981Aue075431;
	Wed, 9 Feb 2011 08:01:10 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1981AHI075429;
	Wed, 9 Feb 2011 08:01:10 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201102090801.p1981AHI075429@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 9 Feb 2011 08:01:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218474 - head/sbin/hastd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Feb 2011 08:01:10 -0000

Author: pjd
Date: Wed Feb  9 08:01:10 2011
New Revision: 218474
URL: http://svn.freebsd.org/changeset/base/218474

Log:
  When we decide to unlink socket file, sun_path must be set. If it is set,
  but there is problem unlinking the file, log a warning.
  
  MFC after:	1 week

Modified:
  head/sbin/hastd/proto_uds.c

Modified: head/sbin/hastd/proto_uds.c
==============================================================================
--- head/sbin/hastd/proto_uds.c	Wed Feb  9 06:38:32 2011	(r218473)
+++ head/sbin/hastd/proto_uds.c	Wed Feb  9 08:01:10 2011	(r218474)
@@ -319,7 +319,12 @@ uds_close(void *ctx)
 	 */
 	if (uctx->uc_side == UDS_SIDE_SERVER_LISTEN &&
 	    uctx->uc_owner == getpid()) {
-		(void)unlink(uctx->uc_sun.sun_path);
+		PJDLOG_ASSERT(uctx->uc_sun.sun_path[0] != '\0');
+		if (unlink(uctx->uc_sun.sun_path) == -1) {
+			pjdlog_errno(LOG_WARNING,
+			    "Unable to unlink socket file %s",
+			    uctx->uc_sun.sun_path);
+		}
 	}
 	uctx->uc_owner = 0;
 	uctx->uc_magic = 0;