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 360d0eb..7fe3d8f 100644 (file)
--- a/lib/Sys/Hostname.pm
+++ b/lib/Sys/Hostname.pm
@@ -39,8 +39,7 @@ sub hostname {
   if ($^O eq 'VMS') {
 
     # method 2 - no sockets ==> return DECnet node name
-    eval {local $SIG{'__DIE__'};
-          my($test) = gethostbyname('me')}; # returns 'me' on most systems
+    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
@@ -70,7 +69,7 @@ sub hostname {
 
     # method 2 - syscall is preferred since it avoids tainting problems
     eval {
-        local $SIG{'__DIE__'};
+       local $SIG{__DIE__};
        {
            package main;
            require "syscall.ph";
@@ -79,21 +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__'};
+       local $SIG{__DIE__};
        $host = `(hostname) 2>/dev/null`; # bsdish
     }
 
     # method 4 - sysV uname command (may truncate)
     || eval {
-        local $SIG{'__DIE__'};
+       local $SIG{__DIE__};
        $host = `uname -n 2>/dev/null`; ## sysVish
     }
 
     # method 5 - Apollo pre-SR10
     || eval {
-        local $SIG{'__DIE__'};
+       local $SIG{__DIE__};
        ($host,$a,$b,$c,$d)=split(/[:\. ]/,`/com/host`,6);
     }