Merge pull request #777 from swaschkut/main

version 2.1.18 - bugfix
PaloAltoNetworks · Sep 20, 2023 · ebf008e · ebf008e
2 parents 512ca29 + eca2b7f
commit ebf008e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,15 @@
 CHANGELOG
 
-2.1.17
+2.1.18
+UTIL:
+
+BUGFIX:
+* type=address/service 'actions=move:shared,skipIfConflict' | bugfix as variable $findSubSystem was not declared for targetlocation 'shared'
+
+GENERAL:
+
+
+2.1.17 (20230920)
 UTIL:
 * type=certificate | extend to TemplateStack
 * introduce class SharedGatewayStore | extend different classes to support SharedGateway

diff --git a/lib/misc-classes/PH.php b/lib/misc-classes/PH.php
@@ -182,7 +182,7 @@ function __construct($argv, $argc)
 
     private static $library_version_major = 2;
     private static $library_version_sub = 1;
-    private static $library_version_bugfix = 17;
+    private static $library_version_bugfix = 18;
 
     //BASIC AUTH PAN-OS 7.1
     public static $softwareupdate_key = "658d787f293e631196dac9fb29490f1cc1bb3827";

diff --git a/utils/common/actions-address.php b/utils/common/actions-address.php
@@ -1451,6 +1451,7 @@
 
         if( $targetLocation == 'shared' )
         {
+            $findSubSystem = $rootObject;
             $targetStore = $rootObject->addressStore;
         }
         else

diff --git a/utils/common/actions-service.php b/utils/common/actions-service.php
@@ -573,6 +573,7 @@
 
         if( $targetLocation == 'shared' )
         {
+            $findSubSystem = $rootObject;
             $targetStore = $rootObject->serviceStore;
         }
         else