Merge branch 'main' of https://github.com/EpicGames/zen

1 files changed, 33 insertions, 29 deletions

diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 2f2b3bd33..c504ce7da 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "zenserverprocess.h"
+#include "zenutil/zenserverprocess.h"
 
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
@@ -17,44 +17,46 @@
 
 //////////////////////////////////////////////////////////////////////////
 
+namespace zen {
+
 namespace zenutil {
-class SecurityAttributes
-{
-public:
-	inline SECURITY_ATTRIBUTES* Attributes() { return &m_Attributes; }
+	class SecurityAttributes
+	{
+	public:
+		inline SECURITY_ATTRIBUTES* Attributes() { return &m_Attributes; }
 
-protected:
-	SECURITY_ATTRIBUTES m_Attributes{};
-	SECURITY_DESCRIPTOR m_Sd{};
-};
+	protected:
+		SECURITY_ATTRIBUTES m_Attributes{};
+		SECURITY_DESCRIPTOR m_Sd{};
+	};
 
-// Security attributes which allows any user access
+	// Security attributes which allows any user access
 
-class AnyUserSecurityAttributes : public SecurityAttributes
-{
-public:
-	AnyUserSecurityAttributes()
+	class AnyUserSecurityAttributes : public SecurityAttributes
 	{
-		m_Attributes.nLength		= sizeof m_Attributes;
-		m_Attributes.bInheritHandle = false;  // Disable inheritance
-
-		const BOOL success = InitializeSecurityDescriptor(&m_Sd, SECURITY_DESCRIPTOR_REVISION);
-
-		if (success)
+	public:
+		AnyUserSecurityAttributes()
 		{
-			const BOOL bSetOk = SetSecurityDescriptorDacl(&m_Sd, TRUE, (PACL)NULL, FALSE);
+			m_Attributes.nLength		= sizeof m_Attributes;
+			m_Attributes.bInheritHandle = false;  // Disable inheritance
 
-			if (bSetOk)
-			{
-				m_Attributes.lpSecurityDescriptor = &m_Sd;
-			}
-			else
+			const BOOL success = InitializeSecurityDescriptor(&m_Sd, SECURITY_DESCRIPTOR_REVISION);
+
+			if (success)
 			{
-				zen::ThrowLastError("SetSecurityDescriptorDacl failed", std::source_location::current());
+				const BOOL bSetOk = SetSecurityDescriptorDacl(&m_Sd, TRUE, (PACL)NULL, FALSE);
+
+				if (bSetOk)
+				{
+					m_Attributes.lpSecurityDescriptor = &m_Sd;
+				}
+				else
+				{
+					zen::ThrowLastError("SetSecurityDescriptorDacl failed", std::source_location::current());
+				}
 			}
 		}
-	}
-};
+	};
 
 }  // namespace zenutil
 
@@ -628,3 +630,5 @@ ZenServerInstance::GetBaseUri() const
 
 	return "http://localhost:{}"_format(m_BasePort);
 }
+
+}  // namespace zen