From owner-svn-src-head@freebsd.org  Sat Oct 27 04:10:43 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 539B310D6B78;
 Sat, 27 Oct 2018 04:10:43 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 09F7A7B4EC;
 Sat, 27 Oct 2018 04:10:43 +0000 (UTC)
 (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF4A02F20;
 Sat, 27 Oct 2018 04:10:42 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9R4AgwP014937;
 Sat, 27 Oct 2018 04:10:42 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9R4Ag8N014936;
 Sat, 27 Oct 2018 04:10:42 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201810270410.w9R4Ag8N014936@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sat, 27 Oct 2018 04:10:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r339805 - head/stand/lua
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/lua
X-SVN-Commit-Revision: 339805
X-SVN-Commit-Repository: base
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.29
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: Sat, 27 Oct 2018 04:10:43 -0000

Author: kevans
Date: Sat Oct 27 04:10:42 2018
New Revision: 339805
URL: https://svnweb.freebsd.org/changeset/base/339805

Log:
  lualoader: Always return a proper dictionary for blacklist
  
  If module_blacklist isn't specified, we have an empty blacklist; effectively
  the same as if module_blacklist="" were specified in loader.conf(5).
  
  This was reported when switching to a BE that predated the module_blacklist
  introduction, but the problem is valid all the same and likely to be tripped
  over in other scenarios.
  
  Reported by:	bwidawsk
  MFC after:	3 days

Modified:
  head/stand/lua/config.lua

Modified: head/stand/lua/config.lua
==============================================================================
--- head/stand/lua/config.lua	Sat Oct 27 03:37:14 2018	(r339804)
+++ head/stand/lua/config.lua	Sat Oct 27 04:10:42 2018	(r339805)
@@ -266,12 +266,12 @@ local function isValidComment(line)
 end
 
 local function getBlacklist()
+	local blacklist = {}
 	local blacklist_str = loader.getenv('module_blacklist')
 	if blacklist_str == nil then
-		return nil
+		return blacklist
 	end
 
-	local blacklist = {}
 	for mod in blacklist_str:gmatch("[;, ]?([%w-_]+)[;, ]?") do
 		blacklist[mod] = true
 	end