# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1431549160 -7200
# Node ID 53bfca69c48b58c29d8eaa8efaf256ba7f3ca748
# Parent  3f05b255937f530ea3f7438d0366eca5b307c7d6# Parent  1d4fb397e5613d8e4c77f774a7600ecaaf0d198d
Merge

diff -r 3f05b255937f -r 53bfca69c48b core/portmanager.lua
--- a/core/portmanager.lua	Wed May 13 22:31:59 2015 +0200
+++ b/core/portmanager.lua	Wed May 13 22:32:40 2015 +0200
@@ -152,7 +152,7 @@
 end
 
 function deactivate(service_name, service_info)
-	for name, interface, port, n, active_service
+	for name, interface, port, n, active_service --luacheck: ignore 213/name 213/n
 		in active_services:iter(service_name or service_info and service_info.name, nil, nil, nil) do
 		if service_info == nil or active_service.service == service_info then
 			close(interface, port);
@@ -192,11 +192,11 @@
 end
 
 function close(interface, port)
-	local service, server = get_service_at(interface, port);
+	local service, service_server = get_service_at(interface, port);
 	if not service then
 		return false, "port-not-open";
 	end
-	server:close();
+	service_server:close();
 	active_services:remove(service.name, interface, port);
 	log("debug", "Removed listening service %s from [%s]:%d", service.name, interface, port);
 	return true;
@@ -211,7 +211,7 @@
 	return (services[service_name] or {})[1];
 end
 
-function get_active_services(...)
+function get_active_services()
 	return active_services;
 end