From 6fc9b71a043318cb158101212bd78cb190c43579 Mon Sep 17 00:00:00 2001 From: Calvo Date: Fri, 26 May 2023 13:17:40 +0200 Subject: [PATCH] Os detection fix --- pandora_server/lib/PandoraFMS/Core.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index ea9fb091b1..b49139a60f 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -6689,40 +6689,40 @@ sub pandora_get_os ($$) { return 10; } - if ($os =~ m/Windows.*?(?=\(\d+%\))/i) { + if ($os =~ m/Windows/i) { return 9; } - if ($os =~ m/Cisco.*?(?=\(\d+%\))/i) { + if ($os =~ m/Cisco/i) { return 7; } - if ($os =~ m/SunOS.*?(?=\(\d+%\))/i || $os =~ m/Solaris.*?(?=\(\d+%\))/i) { + if ($os =~ m/SunOS/i || $os =~ m/Solaris/i) { return 2; } - if ($os =~ m/AIX.*?(?=\(\d+%\))/i) { + if ($os =~ m/AIX/i) { return 3; } - if ($os =~ m/HP\-UX.*?(?=\(\d+%\))/i) { + if ($os =~ m/HP\-UX/i) { return 5; } - if ($os =~ m/Apple.*?(?=\(\d+%\))/i || $os =~ m/Darwin.*?(?=\(\d+%\))/i) { + if ($os =~ m/Apple/i || $os =~ m/Darwin/i) { return 8; } - if ($os =~ m/Linux.*?(?=\(\d+%\))/i) { + if ($os =~ m/Linux/i) { return 1; } - if ($os =~ m/Enterasys.*?(?=\(\d+%\))/i || $os =~ m/3com.*?(?=\(\d+%\))/i) { + if ($os =~ m/Enterasys/i || $os =~ m/3com/i) { return 11; } - if ($os =~ m/Octopods.*?(?=\(\d+%\))/i) { + if ($os =~ m/Octopods/i) { return 13; } - if ($os =~ m/embedded.*?(?=\(\d+%\))/i) { + if ($os =~ m/embedded/i) { return 14; } - if ($os =~ m/android.*?(?=\(\d+%\))/i) { + if ($os =~ m/android/i) { return 15; } - if ($os =~ m/BSD.*?(?=\(\d+%\))/i) { + if ($os =~ m/BSD/i) { return 4; }