From 52610e1abed9234cb7162bfe2f8f1ebfa711fc63 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Mon, 15 Jul 2019 20:00:14 +0200
Subject: [PATCH] [STRG-1842] renamed to USB-2000

---
 include/tests_usb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/tests_usb b/include/tests_usb
index 4f5eff59..ef92efd2 100644
--- a/include/tests_usb
+++ b/include/tests_usb
@@ -87,15 +87,15 @@
 #
 #################################################################################
 #
-    # Test        : STRG-1842 (future ID: USB-2000)
+    # Test        : USB-2000 (was STRG-1842)
     # Description : Check USB authorizations
-    Register --test-no STRG-1842 --os Linux --weight L --network NO --category security --description "Check USB authorizations"
+    Register --test-no USB-2000 --os Linux --weight L --network NO --category security --description "Check USB authorizations"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking USB devices authorization to connect to the system"
         FOUND=0
-        USBDEVICESPATH="/sys/bus/usb/devices/usb"
+        USBDEVICESPATH="${ROOTDIR}sys/bus/usb/devices/usb"
         for device in "${USBDEVICESPATH}"*; do
-            if [ -e "${device}/authorized" ] || [ -e "${device}/authorized_default" ]; then
+            if [ -e "${device}/authorized" -o -e "${device}/authorized_default" ]; then
                 if [ $(cat "${device}/authorized_default") -eq 1 ]; then
                     FOUND=1
                     LogText "Test: ${device} is authorized by default"