ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/ihost-perl/ihost.pl
(Generate patch)

Comparing projects/cms/source/host/ihost-perl/ihost.pl (file contents):
Revision 1.15 by pjm2, Mon Feb 5 17:38:38 2001 UTC vs.
Revision 1.16 by tdb, Tue Feb 13 12:28:50 2001 UTC

# Line 203 | Line 203 | sub send_udp_packet() {
203  
204      my($hostname) = hostname();
205      $hostname =~ s/\..*$//g;
206 <    `cat /etc/resolv.conf` =~ /domain\s+([^\s]+)/;
207 <    my($domainname) = $1;
208 <    my($machine_name) = "$hostname.$domainname";
206 >    my($resolv) = `cat /etc/resolv.conf`;
207 >    my($domainname);
208 >    my($machine_name);
209 >    if($resolv =~ /domain\s+([^\s]+)/) {
210 >        # some machines have domain <domain> in resolv.conf
211 >        $domainname = $1;
212 >        $machine_name = "$hostname.$domainname";
213 >    }
214 >    elsif($resolv =~ /search\s+([^\s]+)/) {
215 >        # some machines have search <domain> in resolv.conf
216 >        $domainname = $1;
217 >        $machine_name = "$hostname.$domainname";
218 >    }
219 >    else {
220 >        # we can't find out the domain
221 >        $machine_name = $hostname;
222 >    }
223      my($ip) = inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost');
224  
225      # Build the XML packet this way, as we can clearly

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines