Skip to content

Commit 3b1e8c8

Browse files
committed
Fix CORE-6502: remove integrity checking triggers on RDB$USER_PRIVILEGES.
Direct modification of the table has been forbidden since 3.0. GRANT operations from DDL perform theirown checks. It requires backup/restore but can work if you do not need to perform GRANTs descrobed in the ticket.
1 parent 6108f0e commit 3b1e8c8

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

src/jrd/ini.epp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,6 @@ static const jrd_trg triggers[] =
168168
{ "RDB$TRIGGER_27", (UCHAR) nam_r_fields,
169169
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger27),
170170
trigger27, 0, ODS_8_0 },
171-
{ "RDB$TRIGGER_31", (UCHAR) nam_user_privileges,
172-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger31),
173-
trigger31, 0, ODS_8_1 },
174-
{ "RDB$TRIGGER_32", (UCHAR) nam_user_privileges,
175-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger31), trigger31,
176-
0, ODS_8_1 },
177-
{ "RDB$TRIGGER_33", (UCHAR) nam_user_privileges,
178-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger31), trigger31,
179-
0, ODS_8_1 },
180171
{ "RDB$TRIGGER_34", (UCHAR) nam_rel_constr,
181172
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger34),
182173
trigger34, TRG_ignore_perm, ODS_8_1 },
@@ -224,9 +215,6 @@ static const trigger_msg trigger_messages[] =
224215
{ "RDB$TRIGGER_26", 1, "constaint_on_view", ODS_8_0 },
225216
{ "RDB$TRIGGER_26", 2, "invld_cnstrnt_type", ODS_8_0 },
226217
{ "RDB$TRIGGER_26", 3, "primary_key_exists", ODS_8_0 },
227-
{ "RDB$TRIGGER_31", 0, "no_write_user_priv", ODS_8_1 },
228-
{ "RDB$TRIGGER_32", 0, "no_write_user_priv", ODS_8_1 },
229-
{ "RDB$TRIGGER_33", 0, "no_write_user_priv", ODS_8_1 },
230218
{ "RDB$TRIGGER_24", 2, "integ_index_seg_mod", ODS_11_0 },
231219
{ "RDB$TRIGGER_36", 1, "integ_index_seg_mod", ODS_11_0 },
232220
{ 0, 0, 0, 0 }

src/jrd/trig.h

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,56 +1930,6 @@ static const UCHAR trigger27[] =
19301930
};
19311931

19321932

1933-
/* new trigger to create ODS 8.1 (and to upgrade from ODS 8.0 to ODS 8.1 */
1934-
static const UCHAR trigger31[] =
1935-
{
1936-
blr_version5,
1937-
blr_begin,
1938-
blr_if,
1939-
blr_and,
1940-
blr_not,
1941-
blr_missing,
1942-
blr_field, 1, 11, 'R', 'D', 'B', '$', 'G', 'R', 'A', 'N', 'T', 'O', 'R',
1943-
blr_and,
1944-
blr_neq,
1945-
blr_field, 1, 11, 'R', 'D', 'B', '$', 'G', 'R', 'A', 'N', 'T', 'O', 'R',
1946-
blr_user_name,
1947-
blr_neq,
1948-
blr_sys_function, 20, 'R','D','B','$','S','Y','S','T','E','M','_','P','R','I','V','I','L','E','G','E',1,
1949-
blr_literal, blr_short, 0, Jrd::USE_GRANTED_BY_CLAUSE,0,
1950-
blr_literal, blr_bool, 1,
1951-
blr_begin,
1952-
blr_for,
1953-
blr_rse, 1,
1954-
blr_relation, 13, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
1955-
'N', 'S', 3,
1956-
blr_boolean,
1957-
blr_eql,
1958-
blr_field, 3, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
1959-
'N', '_', 'N', 'A', 'M', 'E',
1960-
blr_literal, blr_text, 12, 0, 'R', 'D', 'B', '$', 'D', 'A', 'T', 'A', 'B',
1961-
'A', 'S', 'E',
1962-
blr_end,
1963-
blr_begin,
1964-
blr_if,
1965-
blr_or,
1966-
blr_missing,
1967-
blr_field, 3, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
1968-
'A', 'M', 'E',
1969-
blr_neq,
1970-
blr_field, 3, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
1971-
'A', 'M', 'E',
1972-
blr_user_name,
1973-
blr_leave, 0,
1974-
blr_end,
1975-
blr_end,
1976-
blr_end,
1977-
blr_end,
1978-
blr_end,
1979-
blr_eoc
1980-
};
1981-
1982-
19831933
/* ODS 8.1 trigger */
19841934
static const UCHAR trigger34[] =
19851935
{

0 commit comments

Comments
 (0)