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

Bugfix CORE-5207: ISQL -X may generate invalid GRANT USAGE statements

Browse Source 
for domains.
This commit is contained in:
Dmitry Yemanov 2016-04-23 23:31:04 +03:00
parent 3052355b1b
commit 86698770b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/isql/extract.epp
View File

@ -1295,7 +1295,7 @@ static processing_state list_all_grants2(bool show_role_list, const SCHAR* termi
ISQL_errmsg(fbStatus); ISQL_errmsg(fbStatus);
return OBJECT_NOT_FOUND; return OBJECT_NOT_FOUND;
END_ERROR END_ERROR
/*
FOR FLD IN RDB$FIELDS WITH FOR FLD IN RDB$FIELDS WITH
FLD.RDB$FIELD_NAME NOT MATCHING "RDB$+" USING "+=[0-9][0-9]* *" FLD.RDB$FIELD_NAME NOT MATCHING "RDB$+" USING "+=[0-9][0-9]* *"
AND FLD.RDB$SYSTEM_FLAG NE 1 AND FLD.RDB$SYSTEM_FLAG NE 1
@ -1351,7 +1351,7 @@ static processing_state list_all_grants2(bool show_role_list, const SCHAR* termi
ISQL_errmsg(fbStatus); ISQL_errmsg(fbStatus);
return OBJECT_NOT_FOUND; return OBJECT_NOT_FOUND;
END_ERROR END_ERROR
*/
// Process DDL permissions // Process DDL permissions
for (int i = obj_database; i < obj_type_MAX; i++) for (int i = obj_database; i < obj_type_MAX; i++)
{ {

4
src/isql/show.epp
View File

@ -1373,7 +1373,7 @@ processing_state SHOW_grants2 (const SCHAR* object,
return (SKIP); return (SKIP);
} }
} }
/*
if (obj_type == obj_field || obj_type == 255) if (obj_type == obj_field || obj_type == 255)
{ {
if (isqlGlob.major_ods >= ODS_VERSION12) if (isqlGlob.major_ods >= ODS_VERSION12)
@ -1592,7 +1592,7 @@ processing_state SHOW_grants2 (const SCHAR* object,
return (SKIP); return (SKIP);
} }
} }
*/
if (obj_type >= obj_database || obj_type == 255) if (obj_type >= obj_database || obj_type == 255)
{ {
if (isqlGlob.major_ods >= ODS_VERSION12) if (isqlGlob.major_ods >= ODS_VERSION12)