--- projects/cms/source/host/ihost-perl/ihost.pl	2001/02/13 12:28:50	1.16
+++ projects/cms/source/host/ihost-perl/ihost.pl	2001/02/27 19:26:51	1.18
@@ -9,8 +9,8 @@
 # methods as you see fit.
 #  - pjm2@ukc.ac.uk
 #
-# $Author: tdb $
-# $Id: ihost.pl,v 1.16 2001/02/13 12:28:50 tdb Exp $
+# $Author: pjm2 $
+# $Id: ihost.pl,v 1.18 2001/02/27 19:26:51 pjm2 Exp $
 #------------------------------------------------------------
 
 $| = 1;
@@ -32,6 +32,7 @@ use vars qw (
              $tcp_port
              $filter_addr
              $file_list
+             $fqdn
             );
 
 if (@ARGV != 2) {
@@ -119,6 +120,13 @@ sub tcp_configure() {
 
     print "File list obtained: $file_list\n";
 
+    print $sock "FQDN\n";
+    $response = <$sock>;
+    chop $response;
+    $fqdn = $response;
+
+    print "FQDN returned: $fqdn\n";
+
     print $sock "UDPUpdateTime\n";
     $response = <$sock>;
     chop $response;
@@ -201,26 +209,8 @@ sub send_udp_packet() {
     }
     $disk_info .= "</disk>";
 
-    my($hostname) = hostname();
-    $hostname =~ s/\..*$//g;
-    my($resolv) = `cat /etc/resolv.conf`;
-    my($domainname);
-    my($machine_name);
-    if($resolv =~ /domain\s+([^\s]+)/) {
-        # some machines have domain <domain> in resolv.conf
-        $domainname = $1;
-        $machine_name = "$hostname.$domainname";
-    }
-    elsif($resolv =~ /search\s+([^\s]+)/) {
-        # some machines have search <domain> in resolv.conf
-        $domainname = $1;
-        $machine_name = "$hostname.$domainname";
-    }
-    else {
-        # we can't find out the domain
-        $machine_name = $hostname;
-    }
-    my($ip) = inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost');
+    my($machine_name) = hostname();
+    my($ip) = inet_ntoa(scalar(gethostbyname($machine_name)) || 'localhost');
 
     # Build the XML packet this way, as we can clearly
     # see the structure and contents... I like this ;-)