From owner-svn-src-all@freebsd.org  Tue Jul 12 13:12:03 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 23BF4B93159;
 Tue, 12 Jul 2016 13:12:03 +0000 (UTC)
 (envelope-from trasz@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 E8A91165C;
 Tue, 12 Jul 2016 13:12:02 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6CDC2UK033005;
 Tue, 12 Jul 2016 13:12:02 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6CDC2Zr033004;
 Tue, 12 Jul 2016 13:12:02 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201607121312.u6CDC2Zr033004@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 12 Jul 2016 13:12:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r302663 - stable/11/usr.sbin/ctld
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jul 2016 13:12:03 -0000

Author: trasz
Date: Tue Jul 12 13:12:01 2016
New Revision: 302663
URL: https://svnweb.freebsd.org/changeset/base/302663

Log:
  MFC r302503:
  
  Fix ctld(8) to not exit when reloading configuration with invalid
  initiator-portal clause.
  
  Approved by:	re (gjb)

Modified:
  stable/11/usr.sbin/ctld/ctld.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/11/usr.sbin/ctld/ctld.c	Tue Jul 12 12:05:58 2016	(r302662)
+++ stable/11/usr.sbin/ctld/ctld.c	Tue Jul 12 13:12:01 2016	(r302663)
@@ -402,7 +402,7 @@ auth_portal_new(struct auth_group *ag, c
 
 error:
 	free(ap);
-	log_errx(1, "Incorrect initiator portal '%s'", portal);
+	log_warnx("incorrect initiator portal \"%s\"", portal);
 	return (NULL);
 }