Merge commit from fork

* Fix #GHSA-ph3g-gc8r-mjh5: USE_NBACKUP_UTILITY allowed full ALTER DATABASE

  SCL_check_database() contained a shortcut that granted any holder of
  USE_NBACKUP_UTILITY permission for all ALTER DATABASE clauses, not just
  backup-related ones (BEGIN/END BACKUP, ADD/DROP DIFFERENCE FILE).

  - Remove the shortcut from SCL_check_database() in scl.epp
  - Make AlterDatabaseNode::checkPermission() clause-aware: allow
    USE_NBACKUP_UTILITY only when no non-backup clauses are present

* USE_NBACKUP_UTILITY: require full ALTER DATABASE for difference file

Author: ChudaykinAlex

src/dsql/DdlNodes.epp

@@ -17594,6 +17594,22 @@ string AlterDatabaseNode::internalPrint(NodePrinter& printer) const
 
 void AlterDatabaseNode::checkPermission(thread_db* tdbb)
 {
+	Jrd::Attachment* const attachment = tdbb->getAttachment();
+
+	const unsigned nbackupClauses = CLAUSE_BEGIN_BACKUP | CLAUSE_END_BACKUP;
+
+	const bool hasNonBackupClauses =
+		(clauses & ~nbackupClauses) ||
+		differenceFile.hasData() ||
+		setDefaultCharSet.hasData() ||
+		setDefaultCollation.hasData() ||
+		linger >= 0 ||
+		ssDefiner.isAssigned() ||
+		cryptPlugin.hasData();
+
+	if (!hasNonBackupClauses && attachment->locksmith(tdbb, USE_NBACKUP_UTILITY))
+		return;
+
 	SCL_check_database(tdbb, SCL_alter);
 }
 

src/jrd/scl.epp

@@ -317,9 +317,6 @@ void SCL_check_database(thread_db* tdbb, SecurityClass::flags_t mask)
 	if (att_class && (att_class->scl_flags & mask))
 		return;
 
-	if (mask == SCL_alter && attachment->locksmith(tdbb, USE_NBACKUP_UTILITY))
-		return;
-
 	if (mask == SCL_drop && attachment->locksmith(tdbb, DROP_DATABASE))
 		return;