diff options
| author | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-02-25 16:59:08 -0500 |
|---|---|---|
| committer | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-02-25 16:59:08 -0500 |
| commit | 30fb32a3ab011c2132ac6732c4044174ce0c25d9 (patch) | |
| tree | d354b75e9c098040c281090d671a268e0c694b22 /func | |
| parent | 0f8dec9ab2659fc5e8ddf83cafd45725b73fd697 (diff) | |
| download | third_party-func-30fb32a3ab011c2132ac6732c4044174ce0c25d9.tar.gz third_party-func-30fb32a3ab011c2132ac6732c4044174ce0c25d9.tar.xz third_party-func-30fb32a3ab011c2132ac6732c4044174ce0c25d9.zip | |
resolve some utils namespace issue
probably should just combine these
Diffstat (limited to 'func')
| -rwxr-xr-x | func/minion/server.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |