Fix for Issue#25

Lennie · Aug 19, 2012 · 27c1953 · 27c1953
1 parent fcc0909
commit 27c1953
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/inc/dns.inc.php b/inc/dns.inc.php
@@ -52,6 +52,7 @@ function validate_input($rid, $zid, $type, &$content, &$name, &$prio, &$ttl) {
                         if (!is_valid_rr_cname_unique($name,$rid)) return false; 
 			if (!is_valid_hostname_fqdn($name,1)) return false;
 			if (!is_valid_hostname_fqdn($content,0)) return false;
+			if (!is_not_empty_cname_rr($name,$zone)) return false;
 			break;
 
 		case "HINFO":
@@ -349,6 +350,17 @@ function is_valid_rr_cname_unique($name,$rid) {
         return true; 
 } 
 
+/*
+ * Check that the zone does not have a empty CNAME RR
+ */
+function is_not_empty_cname_rr($name,$zone) {
+
+	if ($name == $zone) { 
+		error(ERR_DNS_CNAME_EMPTY);
+		return false;
+	}
+	return true;
+}
 
 function is_valid_non_alias_target($target) {
 	global $db;

diff --git a/inc/error.inc.php b/inc/error.inc.php
@@ -96,6 +96,7 @@
 define("ERR_DNS_CNAME", _('This is not a valid CNAME. Did you assign an MX or NS record to the record?'));
 define("ERR_DNS_CNAME_EXISTS", _('This is not a valid record. There is already exists a CNAME with this name.')); 
 define("ERR_DNS_CNAME_UNIQUE", _('This is not a valid CNAME. There is already exists an A, AAAA or CNAME with this name.')); 
+define("ERR_DNS_CNAME_EMPTY", _('Empty CNAME records are not allowed.')); 
 define("ERR_DNS_NON_ALIAS_TARGET", _('You can not point a NS or MX record to a CNAME record. Remove or rame the CNAME record first, or take another name.'));
 define("ERR_DNS_NS_HNAME", _('NS records must be a hostnames.'));
 define("ERR_DNS_MX_PRIO", _('A prio field should be numeric.'));