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

Fixed CORE-5039: Connecting to service with invalid servicename yields incorrect error message

Browse Source
This commit is contained in:
alexpeshkoff 2015-12-17 12:43:23 +00:00
parent f9d5a233e5
commit cb0dfc11cc
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/yvalve/why.cpp
View File

@ -5689,8 +5689,8 @@ YService::YService(const char* serviceName, unsigned int spbLength, const unsign
Config::merge(config, &spb_config);
}
StatusVector temp(NULL);
CheckStatusWrapper status(&temp);
StatusVector t1(NULL), t2(NULL);
StatusVector* st = &t1;
cryptCallback.parentCallback = callback;
@ -5698,7 +5698,8 @@ YService::YService(const char* serviceName, unsigned int spbLength, const unsign
providerIterator.hasData();
providerIterator.next())
{
status.init();
st->init();
CheckStatusWrapper status(st);
IProvider* p = providerIterator.plugin();
p->setDbCryptCallback(&status, &cryptCallback);
@ -5715,10 +5716,22 @@ YService::YService(const char* serviceName, unsigned int spbLength, const unsign
makeHandle(&services, this, handle);
return;
}
switch(st->getErrors()[1])
{
case isc_service_att_err:
st = &t2;
// fall down...
case isc_unavailable:
break;
default:
t1.check();
}
}
// Raise error if any
temp.check();
t1.check();
// If no errors, we are out of providers, raise error anyway
(Arg::Gds(isc_service_att_err) <<