--- projects/cms/source/host/ihost-perl/ihost.pl	2001/02/27 19:14:26	1.17
+++ projects/cms/source/host/ihost-perl/ihost.pl	2001/02/27 19:26:51	1.18
@@ -10,7 +10,7 @@
 #  - pjm2@ukc.ac.uk
 #
 # $Author: pjm2 $
-# $Id: ihost.pl,v 1.17 2001/02/27 19:14:26 pjm2 Exp $
+# $Id: ihost.pl,v 1.18 2001/02/27 19:26:51 pjm2 Exp $
 #------------------------------------------------------------
 
 $| = 1;
@@ -209,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 ;-)