Skip to content

Fixed show grants <rolename> for cumulative roles #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dyemanov merged 1 commit into from
May 14, 2016
Merged

Fixed show grants <rolename> for cumulative roles #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/isql/show.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,8 @@ processing_state SHOW_grants2 (const SCHAR* object,

FOR PRV IN RDB$USER_PRIVILEGES WITH
PRV.RDB$OBJECT_TYPE EQ obj_sql_role AND
PRV.RDB$USER_TYPE EQ obj_user AND
(PRV.RDB$USER_TYPE EQ obj_user OR
PRV.RDB$USER_TYPE EQ obj_sql_role) AND
PRV.RDB$RELATION_NAME EQ object AND
PRV.RDB$PRIVILEGE EQ 'M'
SORTED BY PRV.RDB$USER
Expand All @@ -1052,7 +1053,11 @@ processing_state SHOW_grants2 (const SCHAR* object,
else
with_option[0] = '\0';

sprintf(Print_buffer, "GRANT %s TO %s%s%s%s%s", SQL_identifier,
const char* default_option = "";
if (!PRV.RDB$FIELD_NAME.NULL && PRV.RDB$FIELD_NAME[0] == 'D')
default_option = " DEFAULT";

sprintf(Print_buffer, "GRANT%s %s TO %s%s%s%s%s", default_option, SQL_identifier,
user_string, with_option, granted_by(buf_grantor, PRV.RDB$GRANTOR, PRV.RDB$GRANTOR.NULL),
terminator, NEWLINE);

Expand Down Expand Up @@ -1834,9 +1839,9 @@ void SHOW_grant_roles2 (const SCHAR* terminator,
const char* user_string = fb_utils::exact_name(PRV.RDB$USER);

const char* with_option = "";
const char* default_option = "";
if (PRV.RDB$GRANT_OPTION)
with_option = " WITH ADMIN OPTION";
const char* default_option = "";
if (!PRV.RDB$FIELD_NAME.NULL && PRV.RDB$FIELD_NAME[0] == 'D')
default_option = " DEFAULT";

Expand Down