[Firebird-checkins] SF.net SVN: firebird:[59252] firebird/trunk/src/jrd/vio.cpp

[<ro...@us...>]

Revision: 59252
          http://sourceforge.net/p/firebird/code/59252
Author:   robocop
Date:     2014-03-11 07:40:42 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
More restrictions on sys tables. Please report if you have problems with DDL or the utilities.

Modified Paths:
--------------
    firebird/trunk/src/jrd/vio.cpp

Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp	2014-03-11 06:22:52 UTC (rev 59251)
+++ firebird/trunk/src/jrd/vio.cpp	2014-03-11 07:40:42 UTC (rev 59252)
@@ -159,7 +159,8 @@
 static int prepare_update(thread_db*, jrd_tra*, TraNumber commit_tid_read, record_param*,
 	record_param*, record_param*, PageStack&, bool);
 
-static void protect_system_table(thread_db*, const jrd_rel*, const char*, bool = false);
+static void protect_system_table(thread_db* tdbb, const jrd_rel* relation, const char* operation,
+	bool force_flag = false);
 static void purge(thread_db*, record_param*);
 static Record* replace_gc_record(jrd_rel*, Record**, ULONG);
 static void replace_record(thread_db*, record_param*, PageStack*, const jrd_tra*);
@@ -2932,6 +2933,29 @@
 	{
 		switch ((RIDS) relation->rel_id)
 		{
+		case rel_pages:
+		case rel_database:
+		case rel_formats:
+		case rel_trans:
+		case rel_rcon:
+		case rel_refc:
+		case rel_ccon:
+		case rel_roles:
+		case rel_sec_users:
+		case rel_sec_user_attributes:
+			protect_system_table(tdbb, relation, "INSERT");
+			break;
+
+		case rel_types:
+		case rel_msgs:
+			if (!(tdbb->getDatabase()->dbb_flags & DBB_creating))
+				protect_system_table(tdbb, relation, "INSERT", true);
+			break;
+
+		case rel_log:
+			protect_system_table(tdbb, relation, "INSERT", true);
+			break;
+
 		case rel_relations:
 			EVL_field(0, rpb->rpb_record, f_rel_name, &desc);
 			DFW_post_work(transaction, dfw_create_relation, &desc, 0);
@@ -3229,7 +3253,7 @@
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	Database* const dbb = tdbb->getDatabase();
 	Jrd::Attachment* attachment = tdbb->getAttachment();
 
 #ifdef VIO_DEBUG

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.