summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/conf_mode/dhcp_server.py2
-rwxr-xr-xsrc/conf_mode/dhcpv6_server.py6
-rwxr-xr-xsrc/conf_mode/vrrp.py2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index 6d88ea95a..3e1381cd0 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -753,7 +753,7 @@ def verify(dhcp):
# Subnets must be non overlapping
if subnet['network'] in subnets:
- raise ConfigError('DHCP subnets must be unique! Subnet {0} defined multiple times!'.format(subnet))
+ raise ConfigError('DHCP subnets must be unique! Subnet {0} defined multiple times!'.format(subnet['network']))
else:
subnets.append(subnet['network'])
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index d2769466e..039321430 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -397,6 +397,12 @@ def verify(dhcpv6):
'in shared network {2} is outside subnet {3}!' \
.format(mapping['ipv6_address'], mapping['name'], network['name'], subnet['network']))
+ # Subnets must be unique
+ if subnet['network'] in subnets:
+ raise ConfigError('DHCPv6 subnets must be unique! Subnet {0} defined multiple times!'.format(subnet['network']))
+ else:
+ subnets.append(subnet['network'])
+
# DHCPv6 requires at least one configured address range or one static mapping
# (FIXME: is not actually checked right now?)
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index 85c6ad580..a08493309 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -85,7 +85,7 @@ vrrp_instance {{ group.name }} {
{% if group.auth_password -%}
authentication {
- auth_pass {{ group.auth_password }}
+ auth_pass "{{ group.auth_password }}"
auth_type {{ group.auth_type }}
}
{% endif -%}