From owner-svn-src-head@freebsd.org  Sun Mar 13 19:50:19 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28CFBACF5B7;
 Sun, 13 Mar 2016 19:50:19 +0000 (UTC)
 (envelope-from jceel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE2FBF4A;
 Sun, 13 Mar 2016 19:50:18 +0000 (UTC)
 (envelope-from jceel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2DJoHp7035699;
 Sun, 13 Mar 2016 19:50:17 GMT (envelope-from jceel@FreeBSD.org)
Received: (from jceel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2DJoHBH035698;
 Sun, 13 Mar 2016 19:50:17 GMT (envelope-from jceel@FreeBSD.org)
Message-Id: <201603131950.u2DJoHBH035698@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jceel set sender to
 jceel@FreeBSD.org using -f
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Sun, 13 Mar 2016 19:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296808 - head/usr.sbin/ctld
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2016 19:50:19 -0000

Author: jceel
Date: Sun Mar 13 19:50:17 2016
New Revision: 296808
URL: https://svnweb.freebsd.org/changeset/base/296808

Log:
  Check value returned from ucl_parser_add_file().
  
  Reviewed by:	trasz
  Approved by:	trasz (mentor)
  MFC after:	1 month
  Sponsored by:	iXsystems, Inc.

Modified:
  head/usr.sbin/ctld/uclparse.c

Modified: head/usr.sbin/ctld/uclparse.c
==============================================================================
--- head/usr.sbin/ctld/uclparse.c	Sun Mar 13 19:42:59 2016	(r296807)
+++ head/usr.sbin/ctld/uclparse.c	Sun Mar 13 19:50:17 2016	(r296808)
@@ -886,9 +886,8 @@ uclparse_conf(struct conf *newconf, cons
 
 	conf = newconf;
 	parser = ucl_parser_new(0);
-	ucl_parser_add_file(parser, path);
 
-	if (ucl_parser_get_error(parser)) {
+	if (!ucl_parser_add_file(parser, path)) {
 		log_warn("unable to parse configuration file %s: %s", path,
 		    ucl_parser_get_error(parser));
 		return (1);