# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1458294302 0
# Node ID 59023dffbdd48ad3038204270404d368109ce40b
# Parent  b0d711cd3da523cef3505079fb4763061d14b94b
mod_firewall: Allow underscore in mark names (thanks Ge0rG)

diff -r b0d711cd3da5 -r 59023dffbdd4 mod_firewall/conditions.lib.lua
--- a/mod_firewall/conditions.lib.lua	Thu Mar 17 21:30:09 2016 +0000
+++ b/mod_firewall/conditions.lib.lua	Fri Mar 18 09:45:02 2016 +0000
@@ -187,9 +187,9 @@
 end
 
 function condition_handlers.ORIGIN_MARKED(name_and_time)
-	local name, time = name_and_time:match("^%s*(%w+)%s+%(([^)]+)s%)%s*$");
+	local name, time = name_and_time:match("^%s*([%w_]+)%s+%(([^)]+)s%)%s*$");
 	if not name then
-		name = name_and_time:match("^%s*(%w+)%s*$");
+		name = name_and_time:match("^%s*([%w_]+)%s*$");
 	end
 	if not name then
 		error("Error parsing mark name, see documentation for usage examples");