From 1d9b7ef4801e25ce371317a6087b44468df2804d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 30 Oct 2018 09:27:45 +0100
Subject: [PATCH] Firewall/alias, disabled alias should leave us with an empty
 one, for https://github.com/opnsense/core/issues/2860

---
 src/opnsense/scripts/filter/lib/alias.py                      | 2 ++
 .../service/templates/OPNsense/Filter/filter_tables.conf      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/scripts/filter/lib/alias.py b/src/opnsense/scripts/filter/lib/alias.py
index b2b0596a0..bf3f95dac 100644
--- a/src/opnsense/scripts/filter/lib/alias.py
+++ b/src/opnsense/scripts/filter/lib/alias.py
@@ -70,6 +70,8 @@ class Alias(object):
                 tmp = subelem.text.strip()
                 if len(tmp.split('.')) <= 2 and tmp.replace('.', '').isdigit():
                     self._ttl = int(float(tmp))
+            elif subelem.tag in ('aliasurl', 'address', 'url') and subelem.text is None:
+                self._items = set()
             elif subelem.tag == 'aliasurl':
                 self._items = set(sorted(subelem.text.split()))
             elif subelem.tag == 'address' and len(self._items) == 0:
diff --git a/src/opnsense/service/templates/OPNsense/Filter/filter_tables.conf b/src/opnsense/service/templates/OPNsense/Filter/filter_tables.conf
index bee29ac9b..917ce4146 100644
--- a/src/opnsense/service/templates/OPNsense/Filter/filter_tables.conf
+++ b/src/opnsense/service/templates/OPNsense/Filter/filter_tables.conf
@@ -13,7 +13,9 @@
       <name>{{ alias.name|e }}</name>
       <descr>{{ alias.description|default('')|e}}</descr>
       <type>{{ alias.type }}</type>
-{%      if alias.type.startswith('urltable') %}
+{%      if alias.enabled|default('0') == '0'%}
+      <address></address>
+{%      elif alias.type.startswith('urltable') %}
       <url>{{ alias.content|e }}</url>
 {%      elif alias.type.startswith('url') %}
       <aliasurl>{{ alias.content|e }}</aliasurl>