Fixed CORE-5496: Creating SRP SYSDBA with explicit admin (-admin yes in gsec or grant admin role in create user) creates two SYSDBA accounts

Author: AlexPeshkoff

src/auth/SecureRemotePassword/manage/SrpManagement.cpp

@@ -539,12 +539,13 @@ class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::IManagementI
 
 			case Firebird::IUser::OP_USER_DISPLAY:
 				{
-					Firebird::string disp =	"SELECT PLG$USER_NAME, PLG$FIRST, PLG$MIDDLE, PLG$LAST, PLG$COMMENT, PLG$ATTRIBUTES, "
-											"	CASE WHEN RDB$RELATION_NAME IS NULL THEN FALSE ELSE TRUE END, PLG$ACTIVE "
-											"FROM PLG$SRP_VIEW LEFT JOIN RDB$USER_PRIVILEGES "
-											"	ON PLG$SRP_VIEW.PLG$USER_NAME = RDB$USER_PRIVILEGES.RDB$USER "
-											"		AND RDB$RELATION_NAME = '" ADMIN_ROLE "' "
-											"		AND RDB$PRIVILEGE = 'M' ";
+					Firebird::string disp =
+						"WITH ADMINS AS (SELECT RDB$USER FROM RDB$USER_PRIVILEGES "
+						"	WHERE RDB$RELATION_NAME = 'RDB$ADMIN' AND RDB$PRIVILEGE = 'M' GROUP BY RDB$USER) "
+						"SELECT PLG$USER_NAME, PLG$FIRST, PLG$MIDDLE, PLG$LAST, PLG$COMMENT, PLG$ATTRIBUTES, "
+						"	CASE WHEN RDB$USER IS NULL THEN FALSE ELSE TRUE END, PLG$ACTIVE "
+						"FROM PLG$SRP_VIEW LEFT JOIN ADMINS "
+						"	ON PLG$SRP_VIEW.PLG$USER_NAME = ADMINS.RDB$USER ";
 					if (user->userName()->entered())
 					{
 						disp += " WHERE PLG$USER_NAME = ?";