summaryrefslogtreecommitdiffstats
path: root/func/minion/server.py
diff options
context:
space:
mode:
Diffstat (limited to 'func/minion/server.py')
-rwxr-xr-xfunc/minion/server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/func/minion/server.py b/func/minion/server.py
index c900a09..3ef7786 100755
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -218,7 +218,8 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer,
return peer_cert.get_subject().CN
def _check_acl(self, cert, ip, method, params):
- acls = utils.get_acls_from_config(fn=self.config.acl_config)
+ acls = utils.get_acls_from_config(acldir=self.config.acl_dir)
+
# certmaster always gets to run things
ca_cn = self._our_ca.get_subject().CN
ca_hash = self._our_ca.subject_name_hash()