Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[52493] firebird/trunk
|
From: <hv...@us...> - 2011-03-02 23:43:04
|
Revision: 52493
http://firebird.svn.sourceforge.net/firebird/?rev=52493&view=rev
Author: hvlad
Date: 2011-03-02 23:42:58 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Follow Alex changes
Modified Paths:
--------------
firebird/trunk/builds/win32/msvc10/common.vcxproj
firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
firebird/trunk/builds/win32/msvc10/engine.vcxproj
firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters
firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters
firebird/trunk/builds/win32/msvc10/gsec.vcxproj
firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters
firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-03-02 23:42:58 UTC (rev 52493)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -64,6 +64,7 @@
<ClCompile Include="..\..\..\src\common\quad.cpp" />
<ClCompile Include="..\..\..\src\common\ScanDir.cpp" />
<ClCompile Include="..\..\..\src\common\sdl.cpp" />
+ <ClCompile Include="..\..\..\src\common\security.cpp" />
<ClCompile Include="..\..\..\src\common\sha.cpp" />
<ClCompile Include="..\..\..\src\common\StatusArg.cpp" />
<ClCompile Include="..\..\..\src\common\StatusHolder.cpp" />
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-03-02 23:42:58 UTC (rev 52493)
@@ -183,6 +183,9 @@
<ClCompile Include="..\..\..\src\common\os\win32\path_utils.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\common\security.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\common\xdr_proto.h">
Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-03-02 23:42:58 UTC (rev 52493)
@@ -158,7 +158,6 @@
<ClCompile Include="..\..\..\src\jrd\VirtualTable.cpp" />
<ClCompile Include="..\..\..\src\lock\lock.cpp" />
<ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp" />
- <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp" />
<ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp" />
<ClCompile Include="..\..\..\src\utilities\nbackup\nbackup.cpp" />
</ItemGroup>
@@ -561,4 +560,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-03-02 23:42:58 UTC (rev 52493)
@@ -402,9 +402,6 @@
<ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp">
<Filter>Services</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp">
- <Filter>Services</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp">
<Filter>Services</Filter>
</ClCompile>
@@ -465,6 +462,9 @@
<ClCompile Include="..\..\..\gen\utilities\gstat\dba.cpp">
<Filter>Services</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\jrd\recsrc\ConditionalStream.cpp">
+ <Filter>JRD files\Data Access</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@@ -1076,4 +1076,4 @@
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2011-03-02 23:42:58 UTC (rev 52493)
@@ -206,7 +206,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\auth\SecurityDatabase\pwd.cpp" />
+ <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp" />
<ClCompile Include="..\..\..\src\remote\server\os\win32\chop.cpp" />
<ClCompile Include="..\..\..\src\remote\server\os\win32\cntl.cpp" />
<ClCompile Include="..\..\..\src\remote\server\os\win32\property.cpp" />
Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2011-03-02 23:42:58 UTC (rev 52493)
@@ -13,9 +13,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\auth\SecurityDatabase\pwd.cpp">
- <Filter>AUTH files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\remote\server\os\win32\window.cpp">
<Filter>Remote server</Filter>
</ClCompile>
@@ -34,6 +31,9 @@
<ClCompile Include="..\..\..\src\remote\server\os\win32\srvr_w32.cpp">
<Filter>Remote server</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp">
+ <Filter>AUTH files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\remote\server\os\win32\server.ico">
Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2011-03-02 23:42:58 UTC (rev 52493)
@@ -178,7 +178,6 @@
<ItemGroup>
<ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp" />
<ClCompile Include="..\..\..\src\utilities\gsec\main\gsecMain.cpp" />
- <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\utilities\gsec\gsec.h" />
Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters 2011-03-02 23:42:58 UTC (rev 52493)
@@ -17,9 +17,6 @@
<ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp">
<Filter>UTILITIES files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp">
- <Filter>UTILITIES files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\utilities\gsec\main\gsecMain.cpp">
<Filter>UTILITIES files</Filter>
</ClCompile>
Modified: firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp
===================================================================
--- firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp 2011-03-02 23:42:58 UTC (rev 52493)
@@ -670,6 +670,49 @@
return false;
}
+#include "Interface.h"
+
+using namespace Firebird;
+
+class DummyMasterImpl : public IMaster
+{
+public:
+ virtual void FB_CARG addRef()
+ {
+ };
+ virtual int FB_CARG release()
+ {
+ return 1;
+ };
+ virtual int FB_CARG version()
+ {
+ return IMaster::VERSION;
+ };
+
+ virtual Status* FB_CARG getStatusInstance()
+ {
+ fb_assert(false);
+ return NULL;
+ };
+ virtual IPlugin* FB_CARG getPluginInterface() {
+ fb_assert(false);
+ return NULL;
+ };
+ virtual int FB_CARG upgradeInterface(Interface* toUpgrade, int desiredVersion, void* missingFunctionClass)
+ {
+ fb_assert(false);
+ return 0;
+ };
+ virtual const char* FB_CARG circularAlloc(const char* s, size_t len, intptr_t thr)
+ {
+ char* buf = (char*) malloc(len+1);
+ memcpy(buf, s, len);
+ buf[len] = 0;
+ return buf;
+ };
+};
+
+
extern "C" {
void ERR_bugcheck(int)
@@ -680,4 +723,9 @@
{
}
+Firebird::IMaster* ISC_EXPORT fb_get_master_interface()
+{
+ static DummyMasterImpl dummyMaster;
+ return &dummyMaster;
+}
} // extern "C"
Modified: firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp 2011-03-02 23:42:58 UTC (rev 52493)
@@ -113,6 +113,7 @@
#include "FirebirdPluginApi.h"
#include "../common/classes/ImplementHelper.h"
#include "../auth/trusted/AuthSspi.h"
+#include "../auth/SecurityDatabase/LegacyServer.h"
static THREAD_ENTRY_DECLARE inet_connect_wait_thread(THREAD_ENTRY_PARAM);
Modified: firebird/trunk/src/utilities/gsec/gsec.cpp
===================================================================
--- firebird/trunk/src/utilities/gsec/gsec.cpp 2011-03-02 13:42:56 UTC (rev 52492)
+++ firebird/trunk/src/utilities/gsec/gsec.cpp 2011-03-02 23:42:58 UTC (rev 52493)
@@ -979,7 +979,7 @@
break;
#ifdef TRUSTED_AUTH
case IN_SW_GSEC_TRUSTED_AUTH:
- user_data->trusted_auth = true;
+ user_data->trustedAuth = true;
break;
#endif
case IN_SW_GSEC_0:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
