Sys::Hostname fails under Solaris 2.5 when setuid

[p5sagit/p5-mst-13.2.git] / lib / Sys / Hostname.pm

diff --git a/lib/Sys/Hostname.pm b/lib/Sys/Hostname.pm
index 457bf1a..7fe3d8f 100644 (file)
--- a/lib/Sys/Hostname.pm
+++ b/lib/Sys/Hostname.pm
@@ -1,7 +1,6 @@
 package Sys::Hostname;
 
 use Carp;
-use Config;
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(hostname);
@@ -26,7 +25,7 @@ All nulls, returns, and newlines are removed from the result.
 
 =head1 AUTHOR
 
-David Sundstrom <sunds@asictest.sc.ti.com>
+David Sundstrom E<lt>F<sunds@asictest.sc.ti.com>E<gt>
 
 Texas Instruments
 
@@ -37,10 +36,11 @@ sub hostname {
   # method 1 - we already know it
   return $host if defined $host;
 
-  if ($Config{'osname'} eq 'VMS') {
+  if ($^O eq 'VMS') {
 
     # method 2 - no sockets ==> return DECnet node name
-    if (!$Config{'d_has_sockets'}) { return $host = $ENV{'SYS$NODE'}; }
+    eval { local $SIG{__DIE__}; $host = (gethostbyname('me'))[0] };
+    if ($@) { return $host = $ENV{'SYS$NODE'}; }
 
     # method 3 - has someone else done the job already?  It's common for the
     #    TCP/IP stack to advertise the hostname via a logical name.  (Are
@@ -56,13 +56,20 @@ sub hostname {
     return $host if $host;
 
     # rats!
+    $host = '';
     Carp::croak "Cannot get host name of local machine";  
 
   }
+  elsif ($^O eq 'MSWin32') {
+    ($host) = gethostbyname('localhost');
+    chomp($host = `hostname 2> NUL`) unless defined $host;
+    return $host;
+  }
   else {  # Unix
 
     # method 2 - syscall is preferred since it avoids tainting problems
     eval {
+       local $SIG{__DIE__};
        {
            package main;
            require "syscall.ph";
@@ -71,18 +78,33 @@ sub hostname {
        syscall(&main::SYS_gethostname, $host, 65) == 0;
     }
 
+    # method 2a - syscall using systeminfo instead of gethostname
+    #           -- needed on systems like Solaris
+    || eval {
+      {
+          package main;
+          require "sys/syscall.ph";
+          require "sys/systeminfo.ph";
+      }
+      $host = "\0" x 65; ## preload scalar
+      syscall(&main::SYS_systeminfo, &main::SI_HOSTNAME, $host, 65) != -1;
+    }
+
     # method 3 - trusty old hostname command
     || eval {
+       local $SIG{__DIE__};
        $host = `(hostname) 2>/dev/null`; # bsdish
     }
 
     # method 4 - sysV uname command (may truncate)
     || eval {
+       local $SIG{__DIE__};
        $host = `uname -n 2>/dev/null`; ## sysVish
     }
 
     # method 5 - Apollo pre-SR10
     || eval {
+       local $SIG{__DIE__};
        ($host,$a,$b,$c,$d)=split(/[:\. ]/,`/com/host`,6);
     }