From owner-svn-src-head@FreeBSD.ORG  Wed Apr 28 22:23:30 2010
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 1A6F0106564A;
	Wed, 28 Apr 2010 22:23:30 +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 09C128FC0C;
	Wed, 28 Apr 2010 22:23:30 +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 o3SMNTLF074222;
	Wed, 28 Apr 2010 22:23:29 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3SMNTQ4074221;
	Wed, 28 Apr 2010 22:23:29 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201004282223.o3SMNTQ4074221@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 28 Apr 2010 22:23:29 +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: r207343 - 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, 28 Apr 2010 22:23:30 -0000

Author: pjd
Date: Wed Apr 28 22:23:29 2010
New Revision: 207343
URL: http://svn.freebsd.org/changeset/base/207343

Log:
  Don't assume that "resource" property is in metadata.
  
  Reported by:	Mikolaj Golub <to.my.trociny@gmail.com>
  MFC after:	3 days

Modified:
  head/sbin/hastd/metadata.c

Modified: head/sbin/hastd/metadata.c
==============================================================================
--- head/sbin/hastd/metadata.c	Wed Apr 28 22:06:22 2010	(r207342)
+++ head/sbin/hastd/metadata.c	Wed Apr 28 22:23:29 2010	(r207343)
@@ -117,7 +117,7 @@ metadata_read(struct hast_resource *res,
 	}
 
 	str = nv_get_string(nv, "resource");
-	if (strcmp(str, res->hr_name) != 0) {
+	if (str != NULL && strcmp(str, res->hr_name) != 0) {
 		pjdlog_error("Provider %s is not part of resource %s.",
 		    res->hr_localpath, res->hr_name);
 		nv_free(nv);