X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fsyslog.pl;h=9e03399e4df608371ccf957a03fbae2ecbea9afc;hb=4499d6b9d14594604210bc28005c5e4ab2e49947;hp=a3b9edf8dab422058927db41befc9ea0d0b5df59;hpb=a0d0e21ea6ea90a22318550944fe6cb09ae10cda;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/syslog.pl b/lib/syslog.pl
index a3b9edf..9e03399 100644
--- a/lib/syslog.pl
+++ b/lib/syslog.pl
@@ -31,8 +31,16 @@ package syslog;
 
 $host = 'localhost' unless $host;	# set $syslog'host to change
 
+if ($] >= 5) {
+    warn "You should 'use Sys::Syslog' instead; continuing" # if $^W
+} 
+
 require 'syslog.ph';
 
+ eval 'use Socket; 1' 			||
+     eval { require "socket.ph" } 	||
+     require "sys/socket.ph";
+
 $maskpri = &LOG_UPTO(&LOG_DEBUG);
 
 sub main'openlog {
@@ -132,25 +140,25 @@ sub main'syslog {
 
 sub xlate {
     local($name) = @_;
-    $name =~ y/a-z/A-Z/;
+    $name = uc $name;
     $name = "LOG_$name" unless $name =~ /^LOG_/;
     $name = "syslog'$name";
-    eval(&$name) || -1;
+    defined &$name ? &$name : -1;
 }
 
 sub connect {
     $pat = 'S n C4 x8';
 
-    $af_unix = 1;
-    $af_inet = 2;
+    $af_unix = &AF_UNIX;
+    $af_inet = &AF_INET;
 
-    $stream = 1;
-    $datagram = 2;
+    $stream = &SOCK_STREAM;
+    $datagram = &SOCK_DGRAM;
 
     ($name,$aliases,$proto) = getprotobyname('udp');
     $udp = $proto;
 
-    ($name,$aliase,$port,$proto) = getservbyname('syslog','udp');
+    ($name,$aliases,$port,$proto) = getservbyname('syslog','udp');
     $syslog = $port;
 
     if (chop($myname = `hostname`)) {