firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Fixed the compilation.

Browse Source
This commit is contained in:
dimitr 2010-01-23 10:18:55 +00:00
parent c1e971b5fb
commit 7f0b8af499
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/auth/trusted/AuthSspi.cpp
View File

@ -326,20 +326,20 @@ void WinSspiClient::release()
interfaceFree(this);
}
WinSspiServerInstance()
: sspiData(), sspi(0)
WinSspiServerInstance::WinSspiServerInstance()
{ }
WinSspiClientInstance()
: sspiData(), sspi(0)
WinSspiClientInstance::WinSspiClientInstance()
{ }
Result WinSspiServerInstance::startAuthentication(bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface)
{
UCHAR tag = isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth;
Firebird::ClumpletReader rdr(isService ? : , dpb, dpbSize);
const UCHAR tag = isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth;
Firebird::ClumpletReader rdr(isService ? Firebird::ClumpletReader::spbList :
Firebird::ClumpletReader::dpbList,
dpb, dpbSize);
if (rdr.find(tag))
{
sspiData.clear();
@ -362,7 +362,7 @@ Result WinSspiServerInstance::contAuthentication(WriterInterface* writerInterfac
{
return AUTH_FAILED;
}
if (!sspi.active())
if (!sspi.isActive())
{
bool wheel = false;
Firebird::string login;
@ -405,13 +405,13 @@ Result WinSspiClientInstance::startAuthentication(bool isService, const char*, D
dpb->drop();
}
if (sspi.active())
if (sspi.isActive())
{
dpb->insert(tag, sspiData.begin(), sspiData.getCount());
dpb->add(tag, sspiData.begin(), sspiData.getCount());
}
}
return sspi.active() ? AUTH_SUCCESS : AUTH_CONTINUE;
return sspi.isActive() ? AUTH_SUCCESS : AUTH_CONTINUE;
}
Result WinSspiClientInstance::contAuthentication(const unsigned char* data, unsigned int size)
@ -423,7 +423,7 @@ Result WinSspiClientInstance::contAuthentication(const unsigned char* data, unsi
{
return AUTH_FAILED;
}
return sspi.active() ? AUTH_MORE_DATA : AUTH_CONTINUE;
return sspi.isActive() ? AUTH_MORE_DATA : AUTH_CONTINUE;
}
void WinSspiClientInstance::getData(unsigned char** data, unsigned short* dataSize)

4
src/auth/trusted/AuthSspi.h
View File

@ -97,7 +97,7 @@ public:
WinSspiServerInstance();
private:
AuthSspi::DataHolder data;
AuthSspi::DataHolder sspiData;
AuthSspi sspi;
};
@ -111,7 +111,7 @@ public:
WinSspiClientInstance();
private:
AuthSspi::DataHolder data;
AuthSspi::DataHolder sspiData;
AuthSspi sspi;
};

1
src/remote/os/win32/cntl.cpp
View File

@ -34,6 +34,7 @@
#include "../jrd/thread_proto.h"
#include "../jrd/jrd_proto.h"
#include "../common/classes/init.h"
#include "../jrd/ibase.h"
#include <windows.h>

1
src/remote/os/win32/srvr_w32.cpp
View File

@ -107,6 +107,7 @@
#include "../common/utils_proto.h"
#include "../../../common/classes/semaphore.h"
#include "../../../common/classes/FpeControl.h"
#include "../jrd/ibase.h"
static THREAD_ENTRY_DECLARE inet_connect_wait_thread(THREAD_ENTRY_PARAM);

1
src/remote/os/win32/window.cpp
View File

@ -31,6 +31,7 @@
#include "../remote/os/win32/window.rh"
#include "../remote/os/win32/property.rh"
#include "../jrd/ibase.h"
#include "../jrd/svc.h"
#include "../common/thd.h"
#include "../jrd/thread_proto.h"