aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/storage/zenstorageserver.cpp
diff options
context:
space:
mode:
authorLiam Mitchell <[email protected]>2026-03-09 19:24:03 -0700
committerLiam Mitchell <[email protected]>2026-03-09 19:24:03 -0700
commit8a71531578315dacb84ab55e4b85606b53e8c015 (patch)
treef49a67466d076930541c9d9e0fffeb4bc73a463f /src/zenserver/storage/zenstorageserver.cpp
parentMerge branch 'main' into lm/restrict-content-type (diff)
parentMerge pull request #710 from ue-foundation/lm/oidctoken-exe-path (diff)
downloadzen-8a71531578315dacb84ab55e4b85606b53e8c015.tar.xz
zen-8a71531578315dacb84ab55e4b85606b53e8c015.zip
Merge branch 'main' into lm/restrict-content-type
Diffstat (limited to 'src/zenserver/storage/zenstorageserver.cpp')
-rw-r--r--src/zenserver/storage/zenstorageserver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index f43bb9987..d4b8e37ef 100644
--- a/src/zenserver/storage/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
@@ -229,7 +229,9 @@ ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions
*m_AuthMgr,
*m_OpenProcessCache,
*m_JobQueue,
- ServerOptions.RestrictContentTypes});
+ ServerOptions.RestrictContentTypes,
+ ServerOptions.OidcTokenExecutable,
+ ServerOptions.AllowExternalOidcTokenExe});
if (ServerOptions.WorksSpacesConfig.Enabled)
{