firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:03: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 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 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 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 AuthServer = Srp, Win_Sspi
WireCrypt = Enabled WireCrypt = Enabled

9
src/burp/burp.cpp
View File

@ -838,13 +838,15 @@ int gbak(Firebird::UtilSvc* uSvc)
case IN_SW_BURP_STATS: case IN_SW_BURP_STATS:
if (tdgbl->gbl_stat_flags) if (tdgbl->gbl_stat_flags)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name); BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
if (++itr >= argc) if (++itr >= argc)
BURP_error(366, true); // statistics parameter missing BURP_error(366, true); // statistics parameter missing
{ { // scope
const char* perf_val = argv[itr]; const char* perf_val = argv[itr];
const char* c = perf_val; const char* c = perf_val;
size_t len = strlen(STAT_CHARS); size_t len = strlen(STAT_CHARS);
for (; *c && len; c++, len--) for (; *c && len; c++, len--)
{ {
const char* pos = strchr(STAT_CHARS, toupper(*c)); 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); tdgbl->gbl_stat_flags |= 1 << (pos - STAT_CHARS);
} }
if (*c) if (*c)
BURP_error(368, true); // 'too many chars at statistics parameter' BURP_error(368, true); // too many chars at statistics parameter
} }
break; break;
case IN_SW_BURP_CO: case IN_SW_BURP_CO:
if (tdgbl->gbl_sw_convert_ext_tables) if (tdgbl->gbl_sw_convert_ext_tables)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name); BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
@ -2559,6 +2563,7 @@ void BurpGlobals::print_stats_header()
if (gbl_stat_flags & (1 << i)) if (gbl_stat_flags & (1 << i))
burp_output(false, "%-*s", STAT_FORMATS[i].width, STAT_FORMATS[i].header); burp_output(false, "%-*s", STAT_FORMATS[i].width, STAT_FORMATS[i].header);
} }
burp_output(false, "\n"); burp_output(false, "\n");
} }

4
src/isql/isql.epp
View File

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

1
src/jrd/validation.h
View File

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