index f2f3a668b4c07414ca7f4d5ac416a664136cac5f..9a62acf4c0a2c5da9720620c3c180febe2cb42e5 100644 (file)
/* Walk through all zones and detect renamed/added/deleted zones ...
*/
foreach($newZones as $name => $zone){
-
+
/* This zone was renamed
*/
if((!empty($zone['InitialzoneName'])) && ($zone['InitialzoneName'] != $zone['zoneName'])){
*/
$oldDn = "zoneName=".getNameFromMix($zone['InitialzoneName']).",".$HostDn;
$newDn = "zoneName=".getNameFromMix($zone['zoneName']).",".$HostDn;
- $PrePareZoneEntries[$zone['InitialzoneName']] = getNameFromMix($zone['zoneName']);
+ $PrePareZoneEntries[getNameFromMix($zone['InitialzoneName'])] = getNameFromMix($zone['zoneName']);
$move [$oldDn] = $newDn;
}
$base = "zoneName=".getNameFromMix($zone['zoneName']).",".$HostDn;
$oldRDn = "zoneName=". FlipIp(getNameFromMix($zone['InitialReverseZone'])).".in-addr.arpa,".$base;
$newRDn = "zoneName=". FlipIp(getNameFromMix($zone['ReverseZone'])).".in-addr.arpa,".$base;
- $PrePareZoneEntries[FlipIp($zone['InitialReverseZone']).".in-addr.arpa"] = FlipIp($zone['ReverseZone']).".in-addr.arpa";
+ $PrePareZoneEntries[FlipIp(getNameFromMix($zone['InitialReverseZone'])).".in-addr.arpa"] = FlipIp(getNameFromMix($zone['ReverseZone'])).".in-addr.arpa";
$move [$oldRDn] = $newRDn;
}
}
*/
foreach($oldZones as $zone) {
$oldDn = "zoneName=".getNameFromMix($zone['InitialzoneName']).",".$HostDn;
- $del[$oldDn] = "";
+ $del[$oldDn] = $zone;
}
/* Check for entries which must be updated
$udpate = array();
if(count($PrePareZoneEntries)){
$ldap = $config->get_ldap_link();
+
foreach($PrePareZoneEntries as $FromZoneName => $ToZoneName){
$ldap->cd($HostDn);
- $ldap->search("(&(objectClass=dNSZone)(zoneName=".getNameFromMix($FromZoneName).")(!(relativeDomainName=@)))",array("zoneName"));
+ $ldap->search("(&(objectClass=dNSZone)(zoneName=".$FromZoneName.")(!(relativeDomainName=@)))",array("zoneName"));
while($attrs = $ldap->fetch()){
- $zoneUpdates[$attrs['dn']] = array("zoneName"=>$ToZoneName);
+ $attr_to_change = array();
+ $attr_to_change['zoneName'] = $ToZoneName;
+ $zoneUpdates[$attrs['dn']] = $attr_to_change;
}
}
}
-
$ret = array("del" => $del , "move" => $move , "add" => $add,"zoneUpdates"=>$zoneUpdates);
return($ret);
}
* like pTRRecord or CNAMERecord
*/
if($rec['type'] == "pTRRecord"){
- $PTRdn= "relativeDomainName=".$rec['value'].",".$baseDn;
+ $PTRdn= "relativeDomainName=".FlipIP($rec['value']).",".$baseDn;
$ptrObj = $baseObj;
$reverseName = getNameFromMix($reverseNameMix);
$ptrObj['zoneName'] = $reverseName;
}else{
$ptrObj['pTRRecord'] = preg_replace("/\.\.$/",".",$newName.".");
}
- $ptrObj['relativeDomainName'] = $rec['value'];
+ $ptrObj['relativeDomainName'] = FlipIP($rec['value']);
$add[$PTRdn] = $ptrObj;
}else