Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[51361] firebird/trunk
|
From: <hv...@us...> - 2010-07-23 14:06:35
|
Revision: 51361
http://firebird.svn.sourceforge.net/firebird/?rev=51361&view=rev
Author: hvlad
Date: 2010-07-23 14:06:29 +0000 (Fri, 23 Jul 2010)
Log Message:
-----------
Make Windows build work (MSVC8 only) after Alex changes.
Some corrections is still required.
Modified Paths:
--------------
firebird/trunk/builds/win32/defs/fbclient.def
firebird/trunk/builds/win32/make_boot.bat
firebird/trunk/builds/win32/msvc8/gsec.vcproj
firebird/trunk/builds/win32/msvc8/utilities.vcproj
firebird/trunk/builds/win32/preprocess.bat
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/auth/trusted/AuthSspi.h
firebird/trunk/src/jrd/pwd.cpp
firebird/trunk/src/remote/os/win32/srvr_w32.cpp
Modified: firebird/trunk/builds/win32/defs/fbclient.def
===================================================================
--- firebird/trunk/builds/win32/defs/fbclient.def 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/builds/win32/defs/fbclient.def 2010-07-23 14:06:29 UTC (rev 51361)
@@ -350,6 +350,9 @@
_isc_expand_dpb=isc_expand_dpb
_isc_event_block=isc_event_block
+ fb_register_plugin
+ fb_query_plugin
+
;-----------------
; OTHER FUNCTIONS
;-----------------
Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/builds/win32/make_boot.bat 2010-07-23 14:06:29 UTC (rev 51361)
@@ -23,15 +23,16 @@
@echo Creating directories
@rmdir /s /q %FB_GEN_DIR% 2>nul
:: Remove previously generated output, and recreate the directory hierarchy. Note the exceptions to the rule!
-for %%v in ( alice burp dsql gpre isql journal jrd misc msgs qli examples ) do (
+for %%v in ( alice auth burp dsql gpre isql journal jrd misc msgs qli examples ) do (
if NOT "%%v"=="journal" (@mkdir %FB_GEN_DIR%\%%v )
)
@rmdir /s /q %FB_GEN_DIR%\utilities 2>nul
@mkdir %FB_GEN_DIR%\utilities 2>nul
@mkdir %FB_GEN_DIR%\utilities\gstat 2>nul
-@mkdir %FB_GEN_DIR%\utilities\gsec 2>nul
+@mkdir %FB_GEN_DIR%\auth\SecurityDatabase 2>nul
+
::=======
call :btyacc
if "%ERRLEV%"=="1" goto :END
Modified: firebird/trunk/builds/win32/msvc8/gsec.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/gsec.vcproj 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/builds/win32/msvc8/gsec.vcproj 2010-07-23 14:06:29 UTC (rev 51361)
@@ -332,7 +332,7 @@
>
</File>
<File
- RelativePath="..\..\..\gen\$(PlatformName)\utilities\gsec\security.cpp"
+ RelativePath="..\..\..\src\utilities\gsec\security.cpp"
>
</File>
</Filter>
Modified: firebird/trunk/builds/win32/msvc8/utilities.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/utilities.vcproj 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/builds/win32/msvc8/utilities.vcproj 2010-07-23 14:06:29 UTC (rev 51361)
@@ -273,6 +273,10 @@
RelativePath="..\..\..\src\utilities\gsec\gsec.cpp"
>
</File>
+ <File
+ RelativePath="..\..\..\src\utilities\gsec\security.cpp"
+ >
+ </File>
<Filter
Name="epp files"
Filter="epp"
@@ -289,16 +293,12 @@
RelativePath="..\..\..\src\utilities\rstore.epp"
>
</File>
- <File
- RelativePath="..\..\..\src\utilities\security.epp"
- >
- </File>
</Filter>
<Filter
Name="Generated files"
>
<File
- RelativePath="..\..\..\gen\$(PlatformName)\utilities\gsec\security.cpp"
+ RelativePath="..\..\..\gen\Win32\auth\SecurityDatabase\LegacyManagement.cpp"
>
</File>
</Filter>
Modified: firebird/trunk/builds/win32/preprocess.bat
===================================================================
--- firebird/trunk/builds/win32/preprocess.bat 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/builds/win32/preprocess.bat 2010-07-23 14:06:29 UTC (rev 51361)
@@ -74,6 +74,7 @@
:MASTER_PROCESS
@set GPRE=%FB_GEN_DIR%\gpre_embed
@for %%i in (alice_meta) do @call :PREPROCESS alice %%i
+@for %%i in (LegacyManagement) do @call :PREPROCESS auth/SecurityDatabase %%i
@for %%i in (backup, restore, OdsDetection) do @call :PREPROCESS burp %%i
@for %%i in (array, blob) do @call :PREPROCESS dsql %%i
@for %%i in (metd) do @call :PREPROCESS dsql %%i -gds_cxx
@@ -85,7 +86,6 @@
@for %%i in (help, meta, proc, show) do @call :PREPROCESS qli %%i
@for %%i in (extract, isql, show) do @call :PREPROCESS isql %%i
@for %%i in (dba) do @call :PREPROCESS utilities/gstat %%i
-@for %%i in (security) do @call :PREPROCESS utilities/gsec %%i
@for %%i in (stats) do @call :PREPROCESS utilities %%i
@goto :EOF
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2010-07-23 14:06:29 UTC (rev 51361)
@@ -31,8 +31,10 @@
#include "../common/classes/ImplementHelper.h"
namespace {
+#ifndef WIN_NT
char name[] = "LEGACY_AUTH";
Firebird::PluginHelper<Auth::SecurityDatabaseClient, Firebird::Plugin::AuthClient, name> client;
+#endif
}
namespace Auth {
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2010-07-23 14:06:29 UTC (rev 51361)
@@ -31,7 +31,16 @@
#include "../common/classes/ClumpletReader.h"
#include "../common/classes/Interface.h"
+#include "../common/classes/ImplementHelper.h"
+namespace {
+#ifndef WIN_NT
+ char name[] = "WIN_SSPI";
+ Firebird::PluginHelper<Auth::WinSspiServer, Firebird::Plugin::AuthServer, name> server;
+ Firebird::PluginHelper<Auth::WinSspiClient, Firebird::Plugin::AuthClient, name> client;
+#endif
+}
+
using namespace Firebird;
namespace
@@ -336,26 +345,7 @@
return interfaceAlloc<WinSspiClientInstance>();
}
-void WinSspiServer::getName(const char** data, unsigned short* dataSize)
-{
- authName(data, dataSize);
-}
-void WinSspiClient::getName(const char** data, unsigned short* dataSize)
-{
- authName(data, dataSize);
-}
-
-void WinSspiServer::release()
-{
- interfaceFree(this);
-}
-
-void WinSspiClient::release()
-{
- interfaceFree(this);
-}
-
WinSspiServerInstance::WinSspiServerInstance()
: sspiData(*getDefaultMemoryPool())
{ }
Modified: firebird/trunk/src/auth/trusted/AuthSspi.h
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.h 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/src/auth/trusted/AuthSspi.h 2010-07-23 14:06:29 UTC (rev 51361)
@@ -99,16 +99,12 @@
{
public:
ServerInstance* instance();
- void getName(const char** data, unsigned short* dataSize);
- void release();
};
class WinSspiClient : public ClientPlugin
{
public:
ClientInstance* instance();
- void getName(const char** data, unsigned short* dataSize);
- void release();
};
class WinSspiServerInstance : public ServerInstance
Modified: firebird/trunk/src/jrd/pwd.cpp
===================================================================
--- firebird/trunk/src/jrd/pwd.cpp 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/src/jrd/pwd.cpp 2010-07-23 14:06:29 UTC (rev 51361)
@@ -48,9 +48,10 @@
namespace {
// register plugin
-
+#ifndef WIN_NT
char name[] = "LEGACY_AUTH";
PluginHelper<Auth::SecurityDatabaseServer, Firebird::Plugin::AuthServer, name> server;
+#endif
// temporal implementation of timer
Modified: firebird/trunk/src/remote/os/win32/srvr_w32.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/srvr_w32.cpp 2010-07-23 14:01:54 UTC (rev 51360)
+++ firebird/trunk/src/remote/os/win32/srvr_w32.cpp 2010-07-23 14:06:29 UTC (rev 51361)
@@ -109,7 +109,36 @@
#include "../../../common/classes/FpeControl.h"
#include "../jrd/ibase.h"
+// hvlad: following code registering plugins is temporary and should be
+// moved at appropriate places
+#include "../common/classes/ImplementHelper.h"
+#include "../auth/trusted/AuthSspi.h"
+#include "../auth/SecurityDatabase/LegacyClient.h"
+#include "../auth/SecurityDatabase/LegacyManagement.h"
+#include "../jrd/jrd_pwd.h"
+
+namespace {
+
+ // from AuthSspi
+ char name1[] = "WIN_SSPI";
+ Firebird::PluginHelper<Auth::WinSspiServer, Firebird::Plugin::AuthServer, name1> server1;
+ Firebird::PluginHelper<Auth::WinSspiClient, Firebird::Plugin::AuthClient, name1> client1;
+
+ // from LegacyClient
+ char name2[] = "LEGACY_AUTH";
+ Firebird::PluginHelper<Auth::SecurityDatabaseClient, Firebird::Plugin::AuthClient, name2> client2;
+
+ // from LegacyManagement
+ char name3[] = "LEGACY_AUTH";
+ Firebird::PluginHelper<Auth::SecurityDatabaseManagement, Firebird::Plugin::UserManagement, name3> manage3;
+
+ // from pwd
+ char name4[] = "LEGACY_AUTH";
+ Firebird::PluginHelper<Auth::SecurityDatabaseServer, Firebird::Plugin::AuthServer, name4> server4;
+}
+
+
static THREAD_ENTRY_DECLARE inet_connect_wait_thread(THREAD_ENTRY_PARAM);
static THREAD_ENTRY_DECLARE wnet_connect_wait_thread(THREAD_ENTRY_PARAM);
static THREAD_ENTRY_DECLARE xnet_connect_wait_thread(THREAD_ENTRY_PARAM);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
