summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
authorMatt Schwager <schwag09@gmail.com>2012-10-17 14:02:19 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-12 08:35:32 -0500
commitead022433a759686db6de02b91811de7ca166ac7 (patch)
tree887ecbea7b24a80766025de92318a3aa07c6b334 /src/lib/Bcfg2/Server/Core.py
parent168aa5f9d31f310caa2d8fb87b5d46d6e23b5821 (diff)
downloadbcfg2-ead022433a759686db6de02b91811de7ca166ac7.tar.gz
bcfg2-ead022433a759686db6de02b91811de7ca166ac7.tar.bz2
bcfg2-ead022433a759686db6de02b91811de7ca166ac7.zip
Corrected acceptance of wildcard ('*') in ACL XML file.
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index e931a7bc0..c9fd76325 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -1076,7 +1076,7 @@ class BaseCore(object):
""" Check if client IP is in list of accepted IPs """
try:
return (client in self.plugins['Acl'].config.ips or
- '*' in self.plugins['Acl'].config)
+ '*' in self.plugins['Acl'].config.ips)
except KeyError:
# No ACL means accept all incoming ips (wildcard)
return True