summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 9ca540127..e931a7bc0 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -1075,8 +1075,10 @@ class BaseCore(object):
def check_acls(self, client):
""" Check if client IP is in list of accepted IPs """
try:
- return client in self.plugins['Acl'].config.ips
+ return (client in self.plugins['Acl'].config.ips or
+ '*' in self.plugins['Acl'].config)
except KeyError:
+ # No ACL means accept all incoming ips (wildcard)
return True
@exposed