change WhiteList to AllowList

neutrinolabs · Jul 18, 2024 · 2a5f41f · 2a5f41f
1 parent e542c13
commit 2a5f41f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/xrdpdev/xorg.conf b/xrdpdev/xorg.conf
@@ -53,7 +53,7 @@ Section "Device"
     Driver "xrdpdev"
     Option "DRMDevice" "/dev/dri/renderD128"
     Option "DRI3" "1"
-    Option "DRMWhiteList" "i915 radeon"
+    Option "DRMAllowList" "i915 radeon"
 EndSection
 
 Section "Screen"

diff --git a/xrdpdev/xrdpdev.c b/xrdpdev/xrdpdev.c
@@ -75,7 +75,7 @@ This is the main driver file
 char g_drm_device[128] = "/dev/dri/renderD128";
 Bool g_use_dri2 = TRUE;
 Bool g_use_dri3 = TRUE;
-char g_drm_white_list[128] = "";
+char g_drm_allow_list[128] = "";
 #endif
 
 #define LLOG_LEVEL 1
@@ -205,7 +205,7 @@ rdpPreInit(ScrnInfoPtr pScrn, int flags)
             LLOGLN(0, ("rdpPreInit: name [%s]", dver.name));
             LLOGLN(0, ("rdpPreInit: date [%s]", dver.date));
             LLOGLN(0, ("rdpPreInit: desc [%s]", dver.desc));
-            token = strtok(g_drm_white_list, delim);
+            token = strtok(g_drm_allow_list, delim);
             while (token != NULL)
             {
                 LLOGLN(10, ("rdpPreInit: token [%s]", token));
@@ -979,13 +979,13 @@ rdpProbe(DriverPtr drv, int flags)
             LLOGLN(0, ("rdpProbe: found DRI3 xorg.conf value [%s]", val));
 #endif
         }
-        val = xf86FindOptionValue(dev_sections[i]->options, "DRMWhiteList");
+        val = xf86FindOptionValue(dev_sections[i]->options, "DRMAllowList");
         if (val != NULL)
         {
 #if defined(XORGXRDP_GLAMOR)
-            strncpy(g_drm_white_list, val, 127);
+            strncpy(g_drm_allow_list, val, 127);
             g_drm_device[127] = 0;
-            LLOGLN(0, ("rdpProbe: found DRMWhiteList xorg.conf value [%s]", val));
+            LLOGLN(0, ("rdpProbe: found DRMAllowList xorg.conf value [%s]", val));
 #endif
         }
         entity = xf86ClaimFbSlot(drv, 0, dev_sections[i], 1);