Correctly allow a true, false, undef return

1 files changed, 13 insertions, 3 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index a84eca7..dbe7d16 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -205,10 +205,20 @@ function is_macaddr($macaddr) {
 
 /* returns true if $name is a valid name for an alias */
 function is_validaliasname($name) {
+        /* Array of reserved words */
+
+        if (!preg_match("/[^a-zA-Z0-9]/", $name))
+                return true;
+        else
+                return false;
+}
+
+/* returns true if $name is a valid name for an alias */
+function is_validaliasname($name) {
 	/* Array of reserved words */
-	$reserved = array("port");
-	if (in_array($name, $reserved))
-		return -2;
+	$reserved = array("port","pass");
+	if (in_array($name, $reserved, true))
+		return;
 
 	if (!preg_match("/[^a-zA-Z0-9]/", $name))
 		return true;