Merge pull request #53 from plesk/vbaranovskiy-EXTPLESK-3353

Vbaranovskiy extplesk 3353

Author: vbaranovskiy-plesk

CHANGES.md

@@ -1,3 +1,7 @@
+# 1.10.1 (18 February 2022)
+
+* [-] Removal of DNS zones is now again synced between Plesk and secondary DNS servers that use BIND 9.14 and later. (EXTPLESK-3353)
+
 # 1.10.0 (13 August 2021)
 
 * [+] The extension now shows a warning if the custom backend script is not properly configured and offers to configure it if necessary.

meta.xml

@@ -5,7 +5,7 @@
 	<name>Slave DNS Manager</name>
 	<description>The extension for managing a remote slave DNS server via rndc protocol (bind).</description>
 	<category>dns</category>
-	<version>1.10.0</version>
+	<version>1.10.1</version>
 	<release>0</release>
 	<vendor>Plesk</vendor>
 	<url>https://github.com/plesk/ext-slave-dns-manager</url>

plib/library/Rndc.php

@@ -63,8 +63,10 @@ public function deleteZone($domain, Modules_SlaveDnsManager_Slave $slave = null)
             $slaveStatus = $this->checkStatus($slave);
             // version: 9.9.4-RedHat-9.9.4-51.el7_4.2 (none) <id:8f9657aa>
             // version: BIND 9.10.3-P4-Ubuntu <id:ebd72b3> (none)
-            $cleanFlag = (preg_match("/version: (BIND )?(9\.10\.\d+|9\.11\.\d+|9\.12\.\d+)/", $slaveStatus)) ? "-clean" : ""; 
-
+            $cleanFlag = (preg_match("/version: (BIND )?((([9]\.[1-9]?[0-9])|([1-9][0-9]\.[0-9]?[0-9]))\.\d+)/", $slaveStatus)) ? "-clean" : "";
+            if ($cleanFlag) {
+                \pm_Log::debug('Add -clean option because Bind version > 9.10');
+            }
             $this->_call($slave, "delzone $cleanFlag \"{$domain}\" \"{$slave->getRndcClass()}\" \"{$slave->getRndcView()}\"");
         }
     }