index 8ee236d184b347ceef641e817ca428ea8a133eae..065a6e1129204b5aab84c4447748bf8400edd2cb 100644 (file)
/* Remove A record which equals $this->ipHostNumber
*/
+ $ptr = $this->get_pTRRecord();
foreach($this->dnsEntry['RECORDS'] as $key => $rec){
if(($rec['type'] == "aRecord") && ($rec['value'] == $this->ipHostNumber)){
unset($this->dnsEntry['RECORDS'][$key]);
}
+ if(($rec['type'] == "pTRRecord") && ($rec['value'] == $ptr)){
+ unset($this->dnsEntry['RECORDS'][$key]);
+ }
}
/* Get Record types
$this->dialog = new dhcpHost($this->dhcpHostEntry,TRUE);
}
$this->dialog->cn = $this->cn;
+ $this->dialog->dhcpHWAddress = $this->macAddress;
if(!empty($this->ipHostNumber)){
$this->dialog->statements['fixed-address'] = $this->ipHostNumber;
}
$smarty->assign("dhcp_is_Account",$this->dhcp_is_Account);
$smarty->assign("dhcpParentNode", $this->dhcpParentNode);
$smarty->assign("dhcpParentNodes",$this->dhcpParentNodes);
-
-
-
-
-
+ $smarty->assign("dhcpParentNodeCnt",count($this->dhcpParentNodes));
/* There is no dns available
*/
$smarty->assign("DNSAccount",$this->DNS_is_account);
$smarty->assign("Zones",$this->Zones);
+ $smarty->assign("ZoneCnt",count($this->Zones));
$smarty->assign("ZoneKeys",($this->Zones));
$smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
/* Call common method to give check the hook */
$message= plugin::check();
- if($this->dhcpEnabled && $this->dhcpParentNode != "" && count($this->dhcpHostEntry) == 0){
- $message[] =_("You haven not configured your dhcp settings yet.");
+ if($this->dhcpEnabled && $this->dhcp_is_Account && $this->dhcpParentNode != "" && count($this->dhcpHostEntry) == 0){
+ $message[] =_("You have not configured your dhcp settings yet.");
}
/* Check if ip must be given
unset($attrs['dn']);
$ldap->cd("cn=".$this->cn.",".$this->dhcpParentNode);
$res = $ldap->add($attrs);
+# print_a($attrs);
+# print("cn=".$this->cn.",".$this->dhcpParentNode);
show_ldap_error($ldap->get_error(),_("Tried to add new dhcp entry failed."));
}
if($this->initial_dhcp_is_Account && $this->dhcp_is_Account){
/* DHCP node changed */
- if($this->initial_dhcpParentNode != $this->dhcpParentNode){
+ if(($this->initial_dhcpParentNode != $this->dhcpParentNode) ||
+ ($this->cn != $this->OrigCn)){
$attrs = $this->dhcpHostEntry;
+ $attrs['cn'] = $this->cn;
unset($attrs['dn']);
unset($attrs['MODIFIED']);
$ldap->cd("cn=".$this->cn.",".$this->dhcpParentNode);
*/
if(!empty($this->ipHostNumber)){
$this->dnsEntry['RECORDS'][] = array("type"=>"aRecord","value"=>$this->ipHostNumber);
+ $ptr = $this->get_pTRRecord();
+ if(!empty($ptr)){
+ $this->dnsEntry['RECORDS'][] = array("type"=>"pTRRecord","value"=>$ptr);
+ }
}
/* Create diff and follow instructions
while($attr = $ldap->fetch()){
$dhcp_dns[$attr['dn']] = $attr['dhcpPrimaryDN'][0];
}
-
+
foreach($dhcp_dns as $key => $pri_dns){
$ldap->cat($pri_dns,array("cn"));
$tmp = $ldap->fetch();
- $dhcp_dns[$key] = $tmp['cn'][0];
+ if(isset($tmp['cn'][0])){
+ $dhcp_dns[$key] = $tmp['cn'][0];
+ }else{
+ unset($dhcp_dns[$key]);
+ }
}
-
+
+ $tmp = $tmp2 = array();
foreach($dhcp_dns as $dn => $cn){
$ldap->cd($dn);
$ldap->search("(|(objectClass=dhcpService)(objectClass=dhcpGroup)".
"(objectClass=dhcpSubnet)(objectClass=dhcpSharedNetwork))",array("cn"));
- $tmp = array();
while($attr = $ldap->fetch()){
$tmp[$attr['dn']] = $attr['cn'][0];
}
- $tmp2 = $this->create_tree($tmp,preg_replace("/^[^,]+,/i","",$dn),"(".$cn.") ");
+ $tmp2 = array_merge($tmp2,$this->create_tree($tmp,preg_replace("/^[^,]+,/i","",$dn),"(".$cn.") "));
}
return($tmp2);
}
+ /* this function returns the default ptr record entry */
+ function get_pTRRecord()
+ {
+ if(!empty($this->ipHostNumber) && isset($this->dnsEntry['zoneName']) && !empty($this->dnsEntry['zoneName'])){
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cat(getDNSZoneDN($this->config,$this->dnsEntry['zoneName']));
+ $attrs = $ldap->fetch();
+ $tmp = array_flip($this->Zones);
+ $tmp = preg_replace("/^[^\/]*+\//","",$tmp[$this->dnsEntry['zoneName']]);
+ $tmp = trim(preg_replace("/\.in-addr.arpa$/","",$tmp));
+ $ptr = preg_replace("/^".normalizePreg(FlipIp($tmp))."\./","",$this->ipHostNumber);
+ return($ptr);
+ }else{
+ return(FALSE);
+ }
+ }
+
+
function create_tree($arr,$base,$current = "")
{
$ret = array();