Merge remote-tracking branch 'origin/topic/etyp/locals-to-global'

* origin/topic/etyp/locals-to-global:
  Do not export locals

CHANGES

@@ -1,3 +1,9 @@
+7.2.0-dev.199 | 2025-02-14 11:28:48 -0800
+
+  * Do not export locals (Evan Typanski, Corelight)
+
+  * DPD changes - ZAM baseline updates (Johanna Amann, Corelight)
+
 7.2.0-dev.194 | 2025-02-07 07:31:26 +0000
 
   * Allow to track service violations in conn.log. (Johanna Amann, Corelight)

VERSION

@@ -1 +1 @@
-7.2.0-dev.194
+7.2.0-dev.199

src/parse.y

@@ -2212,7 +2212,7 @@ local_id:
 			else
 				{
 				$$ = install_ID($1, current_module.c_str(),
-				                              false, is_export).release();
+				                              false, false).release();
 				}
 			}
 	;

testing/btest/Baseline/language.locals-to-global/.stdout

@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+one
+two

testing/btest/language/locals-to-global.zeek

@@ -0,0 +1,24 @@
+# @TEST-DOC: Ensure that locals are not hoisted to global scope.
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stdout
+
+module Test;
+
+export {
+	function func1()
+		{
+		local t: string = "one";
+		print t;
+		}
+	function func2()
+		{
+		local t: string = "two";
+		print t;
+		}
+}
+
+event zeek_init()
+	{
+	func1();
+	func2();
+	}