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

Some more changes suggested by Claudio

Browse Source
This commit is contained in:
alexpeshkoff 2009-12-16 13:49:49 +00:00
parent 055b77fecc
commit e51b5a1141
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/classes/ClumpletReader.cpp
View File

@ -265,7 +265,7 @@ ClumpletReader::ClumpletType ClumpletReader::getClumpletType(UCHAR tag) const
case isc_action_svc_delete_user: case isc_action_svc_delete_user:
case isc_action_svc_modify_user: case isc_action_svc_modify_user:
case isc_action_svc_display_user: case isc_action_svc_display_user:
case isc_action_svc_display_user_a: case isc_action_svc_display_user_adm:
case isc_action_svc_set_mapping: case isc_action_svc_set_mapping:
case isc_action_svc_drop_mapping: case isc_action_svc_drop_mapping:
switch (tag) switch (tag)

2
src/include/consts_pub.h
View File

@ -292,7 +292,7 @@
#define isc_action_svc_trace_list 26 // List existing sessions #define isc_action_svc_trace_list 26 // List existing sessions
#define isc_action_svc_set_mapping 27 // Set auto admins mapping in security database #define isc_action_svc_set_mapping 27 // Set auto admins mapping in security database
#define isc_action_svc_drop_mapping 28 // Drop auto admins mapping in security database #define isc_action_svc_drop_mapping 28 // Drop auto admins mapping in security database
#define isc_action_svc_display_user_a 29 // Displays user(s) from security database with admin info #define isc_action_svc_display_user_adm 29 // Displays user(s) from security database with admin info
#define isc_action_svc_last 30 // keep it last ! #define isc_action_svc_last 30 // keep it last !
/***************************** /*****************************

8
src/jrd/svc.cpp
View File

@ -730,7 +730,7 @@ static const serv_entry services[] =
{ isc_action_svc_trace_list, "List Trace Sessions", NULL, MAIN_TRACE }, { isc_action_svc_trace_list, "List Trace Sessions", NULL, MAIN_TRACE },
{ isc_action_svc_set_mapping, "Set Domain Admins Mapping to RDB$ADMIN", NULL, MAIN_GSEC }, { isc_action_svc_set_mapping, "Set Domain Admins Mapping to RDB$ADMIN", NULL, MAIN_GSEC },
{ isc_action_svc_drop_mapping, "Drop Domain Admins Mapping to RDB$ADMIN", NULL, MAIN_GSEC }, { isc_action_svc_drop_mapping, "Drop Domain Admins Mapping to RDB$ADMIN", NULL, MAIN_GSEC },
{ isc_action_svc_display_user_a, "Display User with Admin Info", NULL, MAIN_GSEC }, { isc_action_svc_display_user_adm, "Display User with Admin Info", NULL, MAIN_GSEC },
/* actions with no names are undocumented */ /* actions with no names are undocumented */
{ isc_action_svc_set_config, NULL, NULL, TEST_THREAD }, { isc_action_svc_set_config, NULL, NULL, TEST_THREAD },
{ isc_action_svc_default_config, NULL, NULL, TEST_THREAD }, { isc_action_svc_default_config, NULL, NULL, TEST_THREAD },
@ -2048,7 +2048,7 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
svc_id == isc_action_svc_delete_user || svc_id == isc_action_svc_delete_user ||
svc_id == isc_action_svc_modify_user || svc_id == isc_action_svc_modify_user ||
svc_id == isc_action_svc_display_user || svc_id == isc_action_svc_display_user ||
svc_id == isc_action_svc_display_user_a || svc_id == isc_action_svc_display_user_adm ||
svc_id == isc_action_svc_db_stats || svc_id == isc_action_svc_db_stats ||
svc_id == isc_action_svc_properties || svc_id == isc_action_svc_properties ||
svc_id == isc_action_svc_trace_start || svc_id == isc_action_svc_trace_start ||
@ -2524,7 +2524,7 @@ bool Service::process_switches(ClumpletReader& spb, string& switches)
case isc_action_svc_delete_user: case isc_action_svc_delete_user:
case isc_action_svc_display_user: case isc_action_svc_display_user:
case isc_action_svc_display_user_a: case isc_action_svc_display_user_adm:
if (!found) if (!found)
{ {
if (!get_action_svc_parameter(svc_action, gsec_action_in_sw_table, switches)) if (!get_action_svc_parameter(svc_action, gsec_action_in_sw_table, switches))
@ -2533,7 +2533,7 @@ bool Service::process_switches(ClumpletReader& spb, string& switches)
} }
if (spb.isEof() && (svc_action == isc_action_svc_display_user || if (spb.isEof() && (svc_action == isc_action_svc_display_user ||
svc_action == isc_action_svc_display_user_a)) svc_action == isc_action_svc_display_user_adm))
{ {
// in case of "display all users" the spb buffer contains // in case of "display all users" the spb buffer contains
// nothing but isc_action_svc_display_user or isc_spb_dbname // nothing but isc_action_svc_display_user or isc_spb_dbname

2
src/utilities/fbsvcmgr.cpp
View File

@ -479,7 +479,7 @@ const SvcSwitches actionSwitch[] =
{"action_db_stats", putSingleTag, statisticsOptions, isc_action_svc_db_stats, isc_info_svc_line}, {"action_db_stats", putSingleTag, statisticsOptions, isc_action_svc_db_stats, isc_info_svc_line},
{"action_get_ib_log", putSingleTag, 0, isc_action_svc_get_ib_log, isc_info_svc_to_eof}, {"action_get_ib_log", putSingleTag, 0, isc_action_svc_get_ib_log, isc_info_svc_to_eof},
{"action_display_user", putSingleTag, dispdelOptions, isc_action_svc_display_user, isc_info_svc_get_users}, {"action_display_user", putSingleTag, dispdelOptions, isc_action_svc_display_user, isc_info_svc_get_users},
{"action_display_user_a", putSingleTag, dispdelOptions, isc_action_svc_display_user_a, isc_info_svc_get_users}, {"action_display_user_adm", putSingleTag, dispdelOptions, isc_action_svc_display_user_adm, isc_info_svc_get_users},
{"action_add_user", putSingleTag, addmodOptions, isc_action_svc_add_user, 0}, {"action_add_user", putSingleTag, addmodOptions, isc_action_svc_add_user, 0},
{"action_delete_user", putSingleTag, dispdelOptions, isc_action_svc_delete_user, 0}, {"action_delete_user", putSingleTag, dispdelOptions, isc_action_svc_delete_user, 0},
{"action_modify_user", putSingleTag, addmodOptions, isc_action_svc_modify_user, 0}, {"action_modify_user", putSingleTag, addmodOptions, isc_action_svc_modify_user, 0},

2
src/utilities/gsec/call_service.cpp
View File

@ -715,7 +715,7 @@ static void checkServerUsersVersion(isc_svc_handle svc_handle, char& server_user
double f = atof(version.c_str()); double f = atof(version.c_str());
if (f > 2.45) // need 2.5, but take into an account it's float if (f > 2.45) // need 2.5, but take into an account it's float
{ {
server_users = isc_action_svc_display_user_a; server_users = isc_action_svc_display_user_adm;
} }
return; return;
} }

2
src/utilities/gsec/gsecswi.h
View File

@ -106,7 +106,7 @@ static const struct in_sw_tab_t gsec_action_in_sw_table [] =
{IN_SW_GSEC_DIS, isc_action_svc_display_user, "OLD_DISPLAY", 0, 0, 0, false, 0, 2, NULL}, // display user(s) without admin info {IN_SW_GSEC_DIS, isc_action_svc_display_user, "OLD_DISPLAY", 0, 0, 0, false, 0, 2, NULL}, // display user(s) without admin info
{IN_SW_GSEC_MAPPING, isc_action_svc_set_mapping, "MAP SET", 0, 0, 0, false, 0, 2, NULL}, // map admins {IN_SW_GSEC_MAPPING, isc_action_svc_set_mapping, "MAP SET", 0, 0, 0, false, 0, 2, NULL}, // map admins
{IN_SW_GSEC_MAPPING, isc_action_svc_drop_mapping, "MAP DROP", 0, 0, 0, false, 0, 2, NULL}, // map admins {IN_SW_GSEC_MAPPING, isc_action_svc_drop_mapping, "MAP DROP", 0, 0, 0, false, 0, 2, NULL}, // map admins
{IN_SW_GSEC_DIS_ADM, isc_action_svc_display_user_a, "DISPLAY", 0, 0, 0, false, 0, 2, NULL}, // display user(s) with admin info {IN_SW_GSEC_DIS_ADM, isc_action_svc_display_user_adm,"DISPLAY", 0, 0, 0, false, 0, 2, NULL}, // display user(s) with admin info
{IN_SW_GSEC_0, 0, NULL, 0, 0, 0, false, 0, 0, NULL} // End of List {IN_SW_GSEC_0, 0, NULL, 0, 0, 0, false, 0, 0, NULL} // End of List
}; };
#endif // GSEC_GSECSWI_H #endif // GSEC_GSECSWI_H