Fixed CORE-2765: Use of RDB$ADMIN role does not provide SYSDBA rights…

… in GRANT/REVOKE

src/jrd/trig.h

@@ -285,10 +285,15 @@ static const UCHAR trigger1[] =
 	blr_field, 6, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
 		'A', 'M', 'E',
 	blr_field, 1, 8, 'R', 'D', 'B', '$', 'U', 'S', 'E', 'R',
+	blr_or,
 	blr_eql,
 	blr_upcase,
 	blr_user_name,
 	blr_literal, blr_text, 6, 0, 'S', 'Y', 'S', 'D', 'B', 'A',
+	blr_eql,
+	blr_upcase,
+	blr_current_role,
+	blr_literal, blr_text, 9, 0, 'R', 'D', 'B', '$', 'A', 'D', 'M', 'I', 'N',
 	blr_begin,
 	blr_end,
 	blr_if,
@@ -407,10 +412,15 @@ static const UCHAR trigger1[] =
 		'A', 'M', 'E',
 	blr_field, 6, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
 		'A', 'M', 'E',
+	blr_and,
 	blr_neq,
 	blr_upcase,
 	blr_user_name,
 	blr_literal, blr_text, 6, 0, 'S', 'Y', 'S', 'D', 'B', 'A',
+	blr_neq,
+	blr_upcase,
+	blr_current_role,
+	blr_literal, blr_text, 9, 0, 'R', 'D', 'B', '$', 'A', 'D', 'M', 'I', 'N',
 	blr_begin,
 	blr_if,
 	blr_not,
@@ -495,10 +505,15 @@ static const UCHAR trigger1[] =
 		'A', 'M', 'E',
 	blr_field, 6, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
 		'A', 'M', 'E',
+	blr_and,
 	blr_neq,
 	blr_upcase,
 	blr_user_name,
 	blr_literal, blr_text, 6, 0, 'S', 'Y', 'S', 'D', 'B', 'A',
+	blr_neq,
+	blr_upcase,
+	blr_current_role,
+	blr_literal, blr_text, 9, 0, 'R', 'D', 'B', '$', 'A', 'D', 'M', 'I', 'N',
 	blr_begin,
 	blr_if,
 	blr_not,
@@ -648,10 +663,15 @@ static const UCHAR trigger1[] =
 		'A', 'M', 'E',
 	blr_upcase,
 	blr_user_name,
+	blr_and,
 	blr_neq,
 	blr_upcase,
 	blr_user_name,
 	blr_literal, blr_text, 6, 0, 'S', 'Y', 'S', 'D', 'B', 'A',
+	blr_neq,
+	blr_upcase,
+	blr_current_role,
+	blr_literal, blr_text, 9, 0, 'R', 'D', 'B', '$', 'A', 'D', 'M', 'I', 'N',
 	blr_if,
 	blr_not,
 	blr_any,
@@ -753,10 +773,15 @@ static const UCHAR trigger1[] =
 		'A', 'M', 'E',
 	blr_upcase,
 	blr_user_name,
+	blr_and,
 	blr_neq,
 	blr_upcase,
 	blr_user_name,
 	blr_literal, blr_text, 6, 0, 'S', 'Y', 'S', 'D', 'B', 'A',
+	blr_neq,
+	blr_upcase,
+	blr_current_role,
+	blr_literal, blr_text, 9, 0, 'R', 'D', 'B', '$', 'A', 'D', 'M', 'I', 'N',
 	blr_if,
 	blr_not,
 	blr_any,
@@ -2365,10 +2390,15 @@ static const UCHAR trigger31[] =
 	blr_field, 1, 11, 'R', 'D', 'B', '$', 'G', 'R', 'A', 'N', 'T', 'O', 'R',
 	blr_upcase,
 	blr_user_name,
+	blr_and,
 	blr_neq,
 	blr_upcase,
 	blr_user_name,
 	blr_literal, blr_text, 6, 0, 'S', 'Y', 'S', 'D', 'B', 'A',
+	blr_neq,
+	blr_upcase,
+	blr_current_role,
+	blr_literal, blr_text, 9, 0, 'R', 'D', 'B', '$', 'A', 'D', 'M', 'I', 'N',
 	blr_begin,
 	blr_for,
 	blr_rse, 1,