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

Misc.

Browse Source
This commit is contained in:
asfernandes 2015-08-02 15:51:01 +00:00
parent 6684adf32e
commit abde3b2cad
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/README.trusted_authentication
View File

@ -8,7 +8,7 @@ firebird.conf and tune mappings in your databases.
Parameter Authentication in firebird.conf file is not used any more - it's replaced with more
generic AuthServer (and AuthClient) parameters. Also to use trusted authentication one should turn
off mandatory wire encryption because Win_Sspi plugin (which implements trusted authentication on
windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
Windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
AuthServer = Srp, Win_Sspi
WireCrypt = Enabled

13
src/burp/burp.cpp
View File

@ -838,13 +838,15 @@ int gbak(Firebird::UtilSvc* uSvc)
case IN_SW_BURP_STATS:
if (tdgbl->gbl_stat_flags)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
if (++itr >= argc)
BURP_error(366, true); // statistics parameter missing
{
{ // scope
const char* perf_val = argv[itr];
const char* c = perf_val;
size_t len = strlen(STAT_CHARS);
for (; *c && len; c++, len--)
{
const char* pos = strchr(STAT_CHARS, toupper(*c));
@ -853,10 +855,12 @@ int gbak(Firebird::UtilSvc* uSvc)
tdgbl->gbl_stat_flags |= 1 << (pos - STAT_CHARS);
}
if (*c)
BURP_error(368, true); // 'too many chars at statistics parameter'
BURP_error(368, true); // too many chars at statistics parameter
}
break;
case IN_SW_BURP_CO:
if (tdgbl->gbl_sw_convert_ext_tables)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
@ -2461,7 +2465,7 @@ void BurpGlobals::read_stats(SINT64* stats)
isc_database_info(status, &db_handle, sizeof(info), info, sizeof(buffer), buffer);
char *p = buffer, *const e = buffer + sizeof(buffer);
char* p = buffer, *const e = buffer + sizeof(buffer);
while (p < e)
{
int flag = -1;
@ -2483,7 +2487,7 @@ void BurpGlobals::read_stats(SINT64* stats)
if (flag != -1)
{
const int len = isc_vax_integer(p + 1, 2);
stats[flag] = isc_portable_integer((ISC_UCHAR*)p + 1 + 2, len);
stats[flag] = isc_portable_integer((ISC_UCHAR*) p + 1 + 2, len);
p += len + 3;
}
}
@ -2559,6 +2563,7 @@ void BurpGlobals::print_stats_header()
if (gbl_stat_flags & (1 << i))
burp_output(false, "%-*s", STAT_FORMATS[i].width, STAT_FORMATS[i].header);
}
burp_output(false, "\n");
}

4
src/isql/isql.epp
View File

@ -880,6 +880,7 @@ static void readNextInputLine(const char* prompt)
{
// Read the line
char buffer[MAX_USHORT];
if (fgets(buffer, sizeof(buffer), Filelist->Ifp().indev_fpointer) != NULL)
{
size_t lineSize = strlen(buffer);
@ -5961,7 +5962,9 @@ static bool printUser(const char* dbName)
txt.assign(v.value.asVary->vary_string, v.value.asVary->vary_length);
break;
}
txt.trim();
if (fieldInfo[i].skip && txt == fieldInfo[i].skip)
continue;
@ -5971,6 +5974,7 @@ static bool printUser(const char* dbName)
if (wasOut)
isqlGlob.printf("%s", NEWLINE);
return true;
}

1
src/jrd/validation.h
View File

@ -179,7 +179,6 @@ private:
UsedBdbs vdr_used_bdbs;
void cleanup();
RTN corrupt(int, const jrd_rel*, ...);
FETCH_CODE fetch_page(bool validate, ULONG, USHORT, WIN*, void*);

2
src/yvalve/utl.cpp
View File

@ -1038,7 +1038,7 @@ public:
}
private:
ClumpletWriter *pb;
ClumpletWriter* pb;
unsigned char nextTag;
string strVal;
};