From 30fb32a3ab011c2132ac6732c4044174ce0c25d9 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Mon, 25 Feb 2008 16:59:08 -0500 Subject: resolve some utils namespace issue probably should just combine these --- func/minion/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'func') diff --git a/func/minion/server.py b/func/minion/server.py index 531ac7a..8097842 100755 --- a/func/minion/server.py +++ b/func/minion/server.py @@ -34,6 +34,7 @@ import AuthedXMLRPCServer import codes import module_loader import func.utils as futils +import func.minion.utils as fmutils from certmaster import utils from certmaster import requester @@ -235,7 +236,7 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer, return peer_cert.get_subject().CN def _check_acl(self, cert, ip, method, params): - acls = utils.get_acls_from_config(acldir=self.config.acl_dir) + acls = fmutils.get_acls_from_config(acldir=self.config.acl_dir) # certmaster always gets to run things ca_cn = self._our_ca.get_subject().CN -- cgit