Diag DNS do not create an empty alias if name does not resolve

(cherry picked from commit f445385114)
This commit is contained in:
Phil Davis 2017-05-21 09:49:27 +05:45 committed by Renato Botelho
parent 2e7f67b274
commit 14e90f2e5d

View File

@ -122,6 +122,7 @@ if (isset($_POST['create_alias']) && (is_hostname($host) || is_ipaddr($host))) {
if ($resolved) {
$resolved = resolve_host_addresses($host);
$isfirst = true;
$addresses = "";
foreach ($resolved as $re) {
if ($re['data'] != "") {
if (!$isfirst) {
@ -139,18 +140,24 @@ if (isset($_POST['create_alias']) && (is_hostname($host) || is_ipaddr($host))) {
$isfirst = false;
}
}
$newalias = array();
$newalias['name'] = $aliasname;
$newalias['type'] = "network";
$newalias['address'] = $addresses;
$newalias['descr'] = gettext("Created from Diagnostics-> DNS Lookup");
if ($alias_exists) {
$a_aliases[$id] = $newalias;
if ($addresses == "") {
$couldnotcreatealias = true;
} else {
$a_aliases[] = $newalias;
$newalias = array();
$newalias['name'] = $aliasname;
$newalias['type'] = "network";
$newalias['address'] = $addresses;
$newalias['descr'] = gettext("Created from Diagnostics-> DNS Lookup");
if ($alias_exists) {
$a_aliases[$id] = $newalias;
} else {
$a_aliases[] = $newalias;
}
write_config(gettext("Created an alias from Diagnostics - DNS Lookup page."));
$createdalias = true;
}
write_config();
$createdalias = true;
} else {
$couldnotcreatealias = true;
}
}
@ -246,6 +253,14 @@ if ($createdalias) {
}
}
if ($couldnotcreatealias) {
if ($alias_exists) {
print_info_box(sprintf(gettext("Could not update alias for %s"), $host), 'warning', false);
} else {
print_info_box(sprintf(gettext("Could not create alias for %s"), $host), 'warning', false);
}
}
$form = new Form(false);
$section = new Form_Section('DNS Lookup');