From 14652b4fb1c31163bbcec6d8b019bc0fc767ba23 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 16 Jul 2018 17:36:32 +0200
Subject: [PATCH] openvpn export, move alias_expand() into single use-case,
 will be refactored later

---
 src/etc/inc/util.inc           | 14 --------------
 src/www/vpn_openvpn_export.php | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index 6a0bdc4a7..79877683b 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -1049,20 +1049,6 @@ function is_alias($name)
     return array_key_exists($name, $aliastable);
 }
 
-/* expand a host or network alias, if necessary */
-function alias_expand($name)
-{
-    global $aliastable;
-
-    if (array_key_exists($name, $aliastable)) {
-        return "\${$name}";
-    } elseif (is_ipaddr($name) || is_subnet($name) || is_port($name) || is_portrange($name)) {
-        return "{$name}";
-    } else {
-        return null;
-    }
-}
-
 function subnet_size($subnet)
 {
     if (is_subnetv4($subnet)) {
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index a9cf082f6..14f74bffa 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -35,6 +35,22 @@ require_once("services.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
 
+
+/* expand a host or network alias, if necessary */
+function alias_expand($name)
+{
+    global $aliastable;
+
+    if (array_key_exists($name, $aliastable)) {
+        return "\${$name}";
+    } elseif (is_ipaddr($name) || is_subnet($name) || is_port($name) || is_portrange($name)) {
+        return "{$name}";
+    } else {
+        return null;
+    }
+}
+
+
 function filter_generate_port(& $rule, $target = "source", $isnat = false) {
     $src = "";