Always read hostname from config files

net/CHANGELOG

@@ -48,3 +48,4 @@ When changing the hostname on Debian or Ubuntu, update /etc/mailname too.
 Fixed editing of bonding network interfaces on Debian Linux.
 ---- Changes since 1.480 ----
 Fixed network interface management on SuSE 10.2.
+Updated the Hostname and DNS Client page to always show the hostname from config files, rather than the system's short hostname.

net/debian-linux-lib.pl

@@ -350,6 +350,11 @@ return &check_ipaddress_any($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local $hn = &read_file_contents("/etc/hostname");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
 return &get_system_hostname(1);
 }
 

net/freebsd-lib.pl

@@ -452,6 +452,10 @@ else {
 # get_hostname()
 sub get_hostname
 {
+local %rc = &get_rc_conf();
+if ($rc{'hostname'}) {
+	return $rc{'hostname'};
+	}
 return &get_system_hostname();
 }
 

net/gentoo-linux-lib.pl

@@ -261,6 +261,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local %host;
+&read_env_file("/etc/conf.d/hostname", \%host);
+if ($host{'HOSTNAME'}) {
+	return $host{'HOSTNAME'};
+	}
 return &get_system_hostname(1);
 }
 

net/macos-lib.pl

@@ -370,6 +370,10 @@ return undef;
 # get_hostname()
 sub get_hostname
 {
+local $hc = &read_hostconfig();
+if ($hc->{'HOSTNAME'}) {
+	return $hc->{'HOSTNAME'};
+	}
 return &get_system_hostname();
 }
 

net/open-linux-lib.pl

@@ -105,6 +105,11 @@ return &check_ipaddress($_[0]);
 
 sub get_hostname
 {
+local %conf;
+&read_env_file($network_config, \%conf);
+if ($conf{'HOSTNAME'}) {
+	return $conf{'HOSTNAME'};
+	}
 return &get_system_hostname(1);
 }
 

net/openbsd-lib.pl

@@ -389,9 +389,14 @@ sub parse_order
 
 # get_hostname()
 sub get_hostname
-  {
-      return &get_system_hostname();
-  }
+{
+local $hn = &read_file_contents("/etc/myname");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
+return &get_system_hostname();
+}
 
 # save_hostname(name)
 sub save_hostname

net/redhat-linux-lib.pl

@@ -205,6 +205,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local %conf;
+&read_env_file($network_config, \%conf);
+if ($conf{'HOSTNAME'}) {
+	return $conf{'HOSTNAME'};
+	}
 return &get_system_hostname(1);
 }
 

net/slackware-linux-9.1-ALL-lib.pl

@@ -254,6 +254,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local $hn = &read_file_contents("/etc/HOSTNAME");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
 return &get_system_hostname(1);
 }
 

net/slackware-linux-lib.pl

@@ -216,6 +216,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local $hn = &read_file_contents("/etc/HOSTNAME");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
 return &get_system_hostname(1);
 }
 

net/solaris-lib.pl

@@ -296,6 +296,11 @@ else {
 # get_hostname()
 sub get_hostname
 {
+local $hn = &read_file_contents("/etc/nodename");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
 return &get_system_hostname();
 }
 

net/suse-linux-9.0-lib.pl

@@ -151,6 +151,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local $hn = &read_file_contents("/etc/HOSTNAME");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
 return &get_system_hostname(1);
 }
 

net/suse-linux-9.2-ALL-lib.pl

@@ -237,6 +237,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local $hn = &read_file_contents("/etc/HOSTNAME");
+$hn =~ s/\r|\n//g;
+if ($hn) {
+	return $hn;
+	}
 return &get_system_hostname(1);
 }
 

net/united-linux-lib.pl

@@ -110,6 +110,11 @@ return &check_ipaddress($_[0]);
 # get_hostname()
 sub get_hostname
 {
+local %conf;
+&read_env_file($network_config, \%conf);
+if ($conf{'HOSTNAME'}) {
+	return $conf{'HOSTNAME'};
+	}
 return &get_system_hostname(1);
 }