4 files changed, 143 insertions, 123 deletions
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
index 45b899a3614..c23e6f8dd55 100644
--- a/src/mongo/db/mongod.vcxproj
+++ b/src/mongo/db/mongod.vcxproj
@@ -2355,6 +2355,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="auth\authorization_manager_global.cpp" />
     <ClCompile Include="auth\authorization_session.cpp" />
     <ClCompile Include="auth\authorization_session_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -2366,9 +2367,9 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state.cpp" />
-    <ClCompile Include="auth\auth_global_external_state_d.cpp" />
-    <ClCompile Include="auth\auth_global_external_state_s.cpp">
+    <ClCompile Include="auth\authz_manager_external_state.cpp" />
+    <ClCompile Include="auth\authz_manager_external_state_d.cpp" />
+    <ClCompile Include="auth\authz_manager_external_state_s.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
@@ -2378,9 +2379,9 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state.cpp" />
-    <ClCompile Include="auth\auth_session_external_state_d.cpp" />
-    <ClCompile Include="auth\auth_session_external_state_s.cpp">
+    <ClCompile Include="auth\authz_session_external_state.cpp" />
+    <ClCompile Include="auth\authz_session_external_state_d.cpp" />
+    <ClCompile Include="auth\authz_session_external_state_s.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
@@ -2390,7 +2391,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_server_common.cpp" />
+    <ClCompile Include="auth\authz_session_external_state_server_common.cpp" />
     <ClCompile Include="auth\role_graph.cpp" />
     <ClCompile Include="auth\role_graph_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -3873,15 +3874,16 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\s\grid.h" />
     <ClInclude Include="..\s\metadata_loader.h" />
     <ClInclude Include="..\s\range_arithmetic.h" />
+    <ClInclude Include="auth\authorization_manager_global.h" />
     <ClInclude Include="auth\authorization_session.h" />
-    <ClInclude Include="auth\auth_global_external_state.h" />
-    <ClInclude Include="auth\auth_global_external_state_d.h" />
-    <ClInclude Include="auth\auth_global_external_state_s.h" />
-    <ClInclude Include="auth\auth_session_external_state.h" />
-    <ClInclude Include="auth\auth_session_external_state_d.h" />
-    <ClInclude Include="auth\auth_session_external_state_mock.h" />
-    <ClInclude Include="auth\auth_session_external_state_s.h" />
-    <ClInclude Include="auth\auth_session_external_state_server_common.h" />
+    <ClInclude Include="auth\authz_manager_external_state.h" />
+    <ClInclude Include="auth\authz_manager_external_state_d.h" />
+    <ClInclude Include="auth\authz_manager_external_state_s.h" />
+    <ClInclude Include="auth\authz_session_external_state.h" />
+    <ClInclude Include="auth\authz_session_external_state_d.h" />
+    <ClInclude Include="auth\authz_session_external_state_mock.h" />
+    <ClInclude Include="auth\authz_session_external_state_s.h" />
+    <ClInclude Include="auth\authz_session_external_state_server_common.h" />
     <ClInclude Include="auth\role_graph.h" />
     <ClInclude Include="auth\role_name.h" />
     <ClInclude Include="auth\user.h" />
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
index a40ea56a1ce..1bd9545bcce 100644
--- a/src/mongo/db/mongod.vcxproj.filters
+++ b/src/mongo/db/mongod.vcxproj.filters
@@ -1712,9 +1712,6 @@
     <ClCompile Include="fts\tokenizer_test.cpp">
       <Filter>db\fts\test</Filter>
     </ClCompile>
-    <ClCompile Include="auth\auth_server_parameters.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
     <ClCompile Include="stats\timer_stats.cpp">
       <Filter>db\stats</Filter>
     </ClCompile>
@@ -2060,18 +2057,6 @@
     <ClCompile Include="range_deleter_test.cpp">
       <Filter>db\Source Files\o to z</Filter>
     </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_d.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_s.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_server_common.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
     <ClCompile Include="auth\authorization_session.cpp">
       <Filter>db\auth</Filter>
     </ClCompile>
@@ -2138,15 +2123,6 @@
     <ClCompile Include="matcher\path_internal.cpp">
       <Filter>db\matcher</Filter>
     </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state_d.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state_s.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
     <ClCompile Include="matcher\path_test.cpp">
       <Filter>db\matcher</Filter>
     </ClCompile>
@@ -2213,6 +2189,33 @@
     <ClCompile Include="..\util\text_startuptest.cpp">
       <Filter>util\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="auth\authorization_manager_global.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_manager_external_state.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_manager_external_state_d.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_manager_external_state_s.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state_d.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state_s.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state_server_common.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\auth_server_parameters.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\third_party\snappy\config.h">
@@ -4404,21 +4407,6 @@
     <ClInclude Include="range_deleter_stats.h">
       <Filter>db\Header Files\o to z</Filter>
     </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_d.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_mock.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_s.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_server_common.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
     <ClInclude Include="auth\authorization_session.h">
       <Filter>db\auth</Filter>
     </ClInclude>
@@ -4461,15 +4449,6 @@
     <ClInclude Include="matcher\path_internal.h">
       <Filter>db\matcher</Filter>
     </ClInclude>
-    <ClInclude Include="auth\auth_global_external_state.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_global_external_state_d.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_global_external_state_s.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
     <ClInclude Include="matcher\path.h">
       <Filter>db\matcher</Filter>
     </ClInclude>
@@ -4482,6 +4461,33 @@
     <ClInclude Include="ops\update_driver.h">
       <Filter>db\ops</Filter>
     </ClInclude>
+    <ClInclude Include="auth\authorization_manager_global.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_manager_external_state.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_manager_external_state_d.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_manager_external_state_s.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_d.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_mock.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_s.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_server_common.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="mongo.ico">
diff --git a/src/mongo/db/mongod_sm.vcxproj b/src/mongo/db/mongod_sm.vcxproj
index c3b87be2b5e..94ad5827ff0 100644
--- a/src/mongo/db/mongod_sm.vcxproj
+++ b/src/mongo/db/mongod_sm.vcxproj
@@ -2036,6 +2036,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="auth\authorization_manager_global.cpp" />
     <ClCompile Include="auth\authorization_session.cpp" />
     <ClCompile Include="auth\authorization_session_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -2047,9 +2048,9 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state.cpp" />
-    <ClCompile Include="auth\auth_global_external_state_d.cpp" />
-    <ClCompile Include="auth\auth_global_external_state_s.cpp">
+    <ClCompile Include="auth\authz_manager_external_state.cpp" />
+    <ClCompile Include="auth\authz_manager_external_state_d.cpp" />
+    <ClCompile Include="auth\authz_manager_external_state_s.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
@@ -2059,9 +2060,9 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state.cpp" />
-    <ClCompile Include="auth\auth_session_external_state_d.cpp" />
-    <ClCompile Include="auth\auth_session_external_state_s.cpp">
+    <ClCompile Include="auth\authz_session_external_state.cpp" />
+    <ClCompile Include="auth\authz_session_external_state_d.cpp" />
+    <ClCompile Include="auth\authz_session_external_state_s.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
@@ -2071,7 +2072,8 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_server_common.cpp" />
+    <ClCompile Include="auth\authz_session_external_state_server_common.cpp" />
+    <ClCompile Include="auth\role_graph.cpp" />
     <ClCompile Include="auth\role_graph_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -3223,15 +3225,16 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\s\grid.h" />
     <ClInclude Include="..\s\metadata_loader.h" />
     <ClInclude Include="..\s\range_arithmetic.h" />
+    <ClInclude Include="auth\authorization_manager_global.h" />
     <ClInclude Include="auth\authorization_session.h" />
-    <ClInclude Include="auth\auth_global_external_state.h" />
-    <ClInclude Include="auth\auth_global_external_state_d.h" />
-    <ClInclude Include="auth\auth_global_external_state_s.h" />
-    <ClInclude Include="auth\auth_session_external_state.h" />
-    <ClInclude Include="auth\auth_session_external_state_d.h" />
-    <ClInclude Include="auth\auth_session_external_state_mock.h" />
-    <ClInclude Include="auth\auth_session_external_state_s.h" />
-    <ClInclude Include="auth\auth_session_external_state_server_common.h" />
+    <ClInclude Include="auth\authz_manager_external_state.h" />
+    <ClInclude Include="auth\authz_manager_external_state_d.h" />
+    <ClInclude Include="auth\authz_manager_external_state_s.h" />
+    <ClInclude Include="auth\authz_session_external_state.h" />
+    <ClInclude Include="auth\authz_session_external_state_d.h" />
+    <ClInclude Include="auth\authz_session_external_state_mock.h" />
+    <ClInclude Include="auth\authz_session_external_state_s.h" />
+    <ClInclude Include="auth\authz_session_external_state_server_common.h" />
     <ClInclude Include="auth\role_graph.h" />
     <ClInclude Include="auth\role_name.h" />
     <ClInclude Include="auth\user.h" />
diff --git a/src/mongo/db/mongod_sm.vcxproj.filters b/src/mongo/db/mongod_sm.vcxproj.filters
index 5f5ea258cb0..f60e4555340 100644
--- a/src/mongo/db/mongod_sm.vcxproj.filters
+++ b/src/mongo/db/mongod_sm.vcxproj.filters
@@ -1718,18 +1718,6 @@
     <ClCompile Include="range_deleter_stats.cpp">
       <Filter>db\Source Files\o to z</Filter>
     </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_d.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_s.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_session_external_state_server_common.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
     <ClCompile Include="auth\authorization_session.cpp">
       <Filter>db\auth</Filter>
     </ClCompile>
@@ -1790,15 +1778,6 @@
     <ClCompile Include="matcher\path_internal.cpp">
       <Filter>db\matcher</Filter>
     </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state_d.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
-    <ClCompile Include="auth\auth_global_external_state_s.cpp">
-      <Filter>db\auth</Filter>
-    </ClCompile>
     <ClCompile Include="matcher\path.cpp">
       <Filter>db\matcher</Filter>
     </ClCompile>
@@ -1874,6 +1853,33 @@
     <ClCompile Include="..\util\text_startuptest.cpp">
       <Filter>util\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="auth\authorization_manager_global.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_manager_external_state.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_manager_external_state_d.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_manager_external_state_s.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state_d.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state_s.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\authz_session_external_state_server_common.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
+    <ClCompile Include="auth\role_graph.cpp">
+      <Filter>db\auth</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\third_party\snappy\config.h">
@@ -3585,21 +3591,6 @@
     <ClInclude Include="range_deleter_stats.h">
       <Filter>db\Header Files\o to z</Filter>
     </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_d.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_mock.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_s.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_session_external_state_server_common.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
     <ClInclude Include="auth\authorization_session.h">
       <Filter>db\auth</Filter>
     </ClInclude>
@@ -3639,15 +3630,6 @@
     <ClInclude Include="matcher\path_internal.h">
       <Filter>db\matcher</Filter>
     </ClInclude>
-    <ClInclude Include="auth\auth_global_external_state.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_global_external_state_d.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
-    <ClInclude Include="auth\auth_global_external_state_s.h">
-      <Filter>db\auth</Filter>
-    </ClInclude>
     <ClInclude Include="matcher\path.h">
       <Filter>db\matcher</Filter>
     </ClInclude>
@@ -3663,6 +3645,33 @@
     <ClInclude Include="ops\modifier_inc.h">
       <Filter>db\ops</Filter>
     </ClInclude>
+    <ClInclude Include="auth\authorization_manager_global.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_manager_external_state.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_manager_external_state_d.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_manager_external_state_s.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_d.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_mock.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_s.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
+    <ClInclude Include="auth\authz_session_external_state_server_common.h">
+      <Filter>db\auth</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="mongo.ico">