Fix regression due to att_security_class being missing during database creation. Use lazy initialization and predefine the security class name.

Author: dyemanov

src/jrd/constants.h

@@ -139,6 +139,7 @@ inline constexpr const char* PLG_LEGACY_SEC_SCHEMA = "PLG$LEGACY_SEC";
 
 // Automatically created security classes for SQL objects.
 // Keep in sync with trig.h
+inline constexpr const char* DATABASE_CLASS				= "SQL$DATABASE";
 inline constexpr const char* DEFAULT_CLASS				= "SQL$DEFAULT";
 inline constexpr const char* SQL_SECCLASS_GENERATOR		= "RDB$SECURITY_CLASS";
 inline constexpr const char* SQL_SECCLASS_PREFIX		= "SQL$";

src/jrd/ini.epp

@@ -596,11 +596,7 @@ namespace
 				}
 			}
 
-			MetaName securityClass;
-			securityClass.printf("%s%" SQUADFORMAT, SQL_SECCLASS_PREFIX,
-				DPM_gen_id(tdbb, lookupGenerator(SQL_SECCLASS_GENERATOR), false, 1));
-
-			addSecurityClass(tdbb, securityClass);
+			addSecurityClass(tdbb, DATABASE_CLASS);
 
 			handle.reset();
 
@@ -609,7 +605,7 @@ namespace
 			{
 				MODIFY DB USING
 					DB.RDB$SECURITY_CLASS.NULL = FALSE;
-					PAD(securityClass, DB.RDB$SECURITY_CLASS);
+					PAD(DATABASE_CLASS, DB.RDB$SECURITY_CLASS);
 				END_MODIFY
 			}
 			END_FOR

src/jrd/scl.epp

@@ -313,6 +313,10 @@ void SCL_check_database(thread_db* tdbb, SecurityClass::flags_t mask)
 	SET_TDBB(tdbb);
 
 	Jrd::Attachment* const attachment = tdbb->getAttachment();
+
+	if (!attachment->att_security_class)
+		attachment->att_security_class = SCL_get_class(tdbb, DATABASE_CLASS);
+
 	const SecurityClass* const att_class = attachment->att_security_class;
 	if (att_class && (att_class->scl_flags & mask))
 		return;
@@ -1152,7 +1156,16 @@ void UserId::sclInit(thread_db* tdbb, bool create)
 	user->usr_init_role = role_name;
 	attachment->att_user = user;
 
-	if (!create)
+	if (create)
+	{
+		dbb->dbb_owner = user->getUserName();
+		user->usr_privileges.load(INI_owner_privileges().c_str());
+		user->usr_granted_roles.clear();
+		user->usr_granted_roles.add(ADMIN_ROLE);
+
+		user->usr_flags &= ~USR_newrole;
+	}
+	else
 	{
 		AutoCacheRequest request(tdbb, irq_get_att_class, IRQ_REQUESTS);
 
@@ -1170,23 +1183,14 @@ void UserId::sclInit(thread_db* tdbb, bool create)
 			FOR(REQUEST_HANDLE request2)
 				FIRST 1 REL IN RDB$RELATIONS
 				WITH REL.RDB$SCHEMA_NAME EQ SYSTEM_SCHEMA AND
-					 REL.RDB$RELATION_NAME EQ "RDB$DATABASE"
+					REL.RDB$RELATION_NAME EQ "RDB$DATABASE"
 			{
-	            if (!REL.RDB$OWNER_NAME.NULL)
+				if (!REL.RDB$OWNER_NAME.NULL)
 					dbb->dbb_owner = REL.RDB$OWNER_NAME;
 			}
 			END_FOR
 		}
 	}
-	else
-	{
-		dbb->dbb_owner = user->getUserName();
-		user->usr_privileges.load(INI_owner_privileges().c_str());
-		user->usr_granted_roles.clear();
-		user->usr_granted_roles.add("RDB$ADMIN");
-
-		user->usr_flags &= ~USR_newrole;
-	}
 }