From 7fbdb5e4405af17409b5ae61d08968aa423a24e5 Mon Sep 17 00:00:00 2001
From: Dave Hope <dave@SRVGEN03.int.hope.mx>
Date: Sun, 10 Jan 2016 10:39:12 +0000
Subject: [PATCH] Merged changes for Zyxel ES and GS series switches under
 'Zynos'.

---
 includes/definitions.inc.php          | 2 +-
 includes/discovery/os/zynos.inc.php   | 5 +++++
 includes/discovery/os/zyxeles.inc.php | 7 -------
 includes/discovery/os/zyxelgs.inc.php | 5 -----
 4 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 includes/discovery/os/zynos.inc.php
 delete mode 100644 includes/discovery/os/zyxeles.inc.php
 delete mode 100644 includes/discovery/os/zyxelgs.inc.php

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 6e8c2aebbc..670260459f 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -947,7 +947,7 @@ $config['os'][$os]['text'] = 'ZyXEL Prestige';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'zyxel';
 
-$os = 'zyxeles';
+$os = 'zynos';
 $config['os'][$os]['text'] = 'ZyXEL Ethernet Switch';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'zyxel';
diff --git a/includes/discovery/os/zynos.inc.php b/includes/discovery/os/zynos.inc.php
new file mode 100644
index 0000000000..ebf01a7c57
--- /dev/null
+++ b/includes/discovery/os/zynos.inc.php
@@ -0,0 +1,5 @@
+<?php
+if (!$os) {
+	if (strstr($sysObjectId, '.1.3.6.1.4.1.890') && preg_match('/^(ES|GS)/', $sysDescr))
+		$os = 'zynos';
+}
diff --git a/includes/discovery/os/zyxeles.inc.php b/includes/discovery/os/zyxeles.inc.php
deleted file mode 100644
index 22b18dc583..0000000000
--- a/includes/discovery/os/zyxeles.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (!$os) {
-    if (preg_match('/^ES-/', $sysDescr)) {
-        $os = 'zyxeles';
-    }
-}
diff --git a/includes/discovery/os/zyxelgs.inc.php b/includes/discovery/os/zyxelgs.inc.php
deleted file mode 100644
index bec24fc97d..0000000000
--- a/includes/discovery/os/zyxelgs.inc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if (!$os) {
-        if (strstr($sysObjectId, '.1.3.6.1.4.1.890.1.5.8.62') || strstr($sysObjectId, '.1.3.6.1.4.1.890.1.5.8.63'))
-                $os = "zyxeles";
-}