From 86138ed4ebaade6d8309444b6a731d6fdb48fb3b Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 21 Sep 2017 18:23:03 +0200 Subject: [PATCH] Fixed #4769 ISPConfig-3.1.6: mydns_to_powerdns_migration.php not handling apex records correctly --- .../mydns_to_powerdns_migration.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/helper_scripts/mydns_to_powerdns_migration.php b/helper_scripts/mydns_to_powerdns_migration.php index ffe9e4ae8..25a01c5ad 100644 --- a/helper_scripts/mydns_to_powerdns_migration.php +++ b/helper_scripts/mydns_to_powerdns_migration.php @@ -31,11 +31,28 @@ while($row2 = mysql_fetch_array($sql2)) { $file2=$row2['data']; } + + // + // Fix for 'domain.ext.' apex notation + // + $record_name_end=substr($row2['name'], -1); + if ($record_name_end==".") + { + // remove trailing dot from apex + $record_name = substr($row2['name'], 0, strlen($row2['name'])-1); + } + else + { + // add domain to make it a fqdn + $record_name = $row2['name'] . "." . $row3['origin']; + } + + print "$row2[name].$row3[origin]" . " $record_name\r\n"; mysql_select_db("dbispconfig"); $sql3 = mysql_query("SELECT substr(origin,1, LENGTH(origin)-1) AS origin FROM dns_soa where id=$row2[zone];"); $row3 = mysql_fetch_array($sql3); mysql_select_db("powerdns"); - mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$row2[name].$row3[origin]','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');"); + mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$record_name','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');"); } else { -- GitLab