8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 09:23:03 +01:00
This commit is contained in:
asfernandes 2008-07-06 18:08:23 +00:00
parent 36e372279d
commit 4aa6ecbaf1
3 changed files with 27 additions and 27 deletions

View File

@ -411,7 +411,8 @@ void SecurityDatabase::verifyUser(string& name,
static AmCache useNative = AM_UNKNOWN; static AmCache useNative = AM_UNKNOWN;
if (useNative == AM_UNKNOWN) if (useNative == AM_UNKNOWN)
{ {
// We use PathName for case-insensitive string comparison // We use PathName for string comparison using platform filename comparision
// rules (case-sensitive or case-insensitive).
const PathName authMethod(Config::getAuthMethod()); const PathName authMethod(Config::getAuthMethod());
useNative = (authMethod == AmNative || authMethod == AmMixed) ? useNative = (authMethod == AmNative || authMethod == AmMixed) ?
AM_ENABLED : AM_DISABLED; AM_ENABLED : AM_DISABLED;

View File

@ -121,18 +121,18 @@ namespace {
// Option block for service parameter block // Option block for service parameter block
struct Options { struct Options {
string spb_sys_user_name; string spb_sys_user_name;
string spb_user_name; string spb_user_name;
string spb_password; string spb_password;
string spb_password_enc; string spb_password_enc;
string spb_command_line; string spb_command_line;
string spb_network_protocol; string spb_network_protocol;
string spb_remote_address; string spb_remote_address;
string spb_trusted_login; string spb_trusted_login;
string spb_address_path; string spb_address_path;
USHORT spb_version; USHORT spb_version;
bool spb_trusted_role; bool spb_trusted_role;
bool spb_remote; bool spb_remote;
// Parse service parameter block picking up options and things. // Parse service parameter block picking up options and things.
Options(ClumpletReader& spb) : Options(ClumpletReader& spb) :
@ -642,8 +642,8 @@ Service::Service(const TEXT* service_name, USHORT spb_length, const UCHAR* spb_d
} }
if (options.spb_user_name.length() > USERNAME_LENGTH) { if (options.spb_user_name.length() > USERNAME_LENGTH) {
status_exception::raise(Arg::Gds(isc_long_login) status_exception::raise(Arg::Gds(isc_long_login) <<
<< Arg::Num(options.spb_user_name.length()) << Arg::Num(USERNAME_LENGTH)); Arg::Num(options.spb_user_name.length()) << Arg::Num(USERNAME_LENGTH));
} }
// Check that the validated user has the authority to access this service // Check that the validated user has the authority to access this service
@ -2004,8 +2004,7 @@ const TEXT* Service::find_switch(int in_spb_sw, const in_sw_tab_t* table)
} }
bool Service::process_switches(ClumpletReader& spb, bool Service::process_switches(ClumpletReader& spb, string& switches)
string& switches)
{ {
if (spb.getBufferLength() == 0) if (spb.getBufferLength() == 0)
return false; return false;

View File

@ -4587,12 +4587,12 @@ static void add_working_directory(ClumpletWriter& dpb,
} }
static rem_port* analyze(PathName& file_name, static rem_port* analyze(PathName& file_name,
ISC_STATUS* status_vector, ISC_STATUS* status_vector,
const TEXT* user_string, const TEXT* user_string,
bool uv_flag, bool uv_flag,
ClumpletReader& dpb, ClumpletReader& dpb,
PathName& node_name) PathName& node_name)
{ {
/************************************** /**************************************
* *
@ -4726,10 +4726,10 @@ static rem_port* analyze(PathName& file_name,
static rem_port* analyze_service(PathName& service_name, static rem_port* analyze_service(PathName& service_name,
ISC_STATUS* status_vector, ISC_STATUS* status_vector,
const TEXT* user_string, const TEXT* user_string,
bool uv_flag, bool uv_flag,
ClumpletReader& spb) ClumpletReader& spb)
{ {
/************************************** /**************************************
* *