Fixed access restrictions to private routines in packages

Author: AlexPeshkoff

src/dsql/dsql.cpp

@@ -1445,7 +1445,8 @@ dsql_prc::dsql_prc(MemoryPool& p, const jrd_prc* jproc)
 	  prc_in_count(jproc->getInputFields().getCount()),
 	  prc_def_count(jproc->getDefaultCount()),
 	  prc_out_count(jproc->getOutputFields().getCount()),
-	  prc_id(jproc->getId())
+	  prc_id(jproc->getId()),
+	  prc_private(jproc->flPrivate)
 { }
 
 dsql_fld* dsql_prc::cpFields(MemoryPool& p, const Array<NestConst<Parameter>>& fields)
@@ -1495,7 +1496,8 @@ dsql_fld::dsql_fld(MemoryPool& p, const dsc& desc, dsql_fld*** prev)
 
 dsql_udf::dsql_udf(MemoryPool& p, const class Function* jfun)
 	: udf_name(p, jfun->getName()),
-	  udf_arguments(p)
+	  udf_arguments(p),
+	  udf_private(jfun->flPrivate)
 {
 	// return value
 	fb_assert(jfun->getOutputFields().getCount() == 1);

src/dsql/metd.epp

@@ -572,7 +572,7 @@ dsql_udf* METD_get_function(jrd_tra* transaction, DsqlCompilerScratch* dsqlScrat
 
 		if (userFunc->udf_private && name.getSchemaAndPackage() != dsqlScratch->package)
 		{
-			status_exception::raise(Arg::Gds(isc_private_procedure) <<
+			status_exception::raise(Arg::Gds(isc_private_function) <<
 				Arg::Str(name.object) << Arg::Str(name.package));
 		}
 

src/jrd/Function.epp

@@ -271,6 +271,8 @@ ScanResult Function::scan(thread_db* tdbb, ObjectBase::Flag flags)
 			fun_return_arg = X.RDB$RETURN_ARGUMENT;
 			fun_temp_length = length;
 
+			flPrivate = !X.RDB$PRIVATE_FLAG.NULL && X.RDB$PRIVATE_FLAG != 0;
+
 			// Prepare the exception message to be used in case this function ever
 			// causes an exception.  This is done at this time to save us from preparing
 			// (thus allocating) this message every time the function is called.

src/jrd/Routine.h

@@ -162,7 +162,7 @@ namespace Jrd
 
 		void afterDecrement(Jrd::thread_db*);
 		void releaseStatement(thread_db* tdbb);
-		//void remove(thread_db* tdbb);
+
 		virtual void releaseExternal()
 		{
 		}
@@ -188,6 +188,7 @@ namespace Jrd
 	public:
 		bool flReload;
 		bool compiling = false;		// Do not try to load routine's BLR in scan/reload during compile
+		bool flPrivate = false;		// Private routine in a package
 
 	public:
 		Jrd::UserId* invoker;		// Invoker ID

src/jrd/met.epp

@@ -2820,6 +2820,8 @@ ScanResult jrd_prc::scan(thread_db* tdbb, ObjectBase::Flag flags)
 			prc_type = P.RDB$PROCEDURE_TYPE.NULL ?
 				prc_legacy : (prc_t) P.RDB$PROCEDURE_TYPE;
 
+			flPrivate = !P.RDB$PRIVATE_FLAG.NULL && P.RDB$PRIVATE_FLAG != 0;
+
 			if (external || !P.RDB$PROCEDURE_BLR.NULL)
 			{
 				MemoryPool* const csb_pool = dbb->createPool();