From cec2b112db68ab43d54915bc6938f3bf6f4e389a Mon Sep 17 00:00:00 2001
From: Graham Barr <gbarr@pobox.com>
Date: Mon, 25 Feb 2002 14:01:36 +0000
Subject: Net::Config - New config script for MacOS from Chris Nandor

---
 Net/Config.pm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Net/Config.pm b/Net/Config.pm
index c09b834..8984ed7 100644
--- a/Net/Config.pm
+++ b/Net/Config.pm
@@ -13,7 +13,7 @@ use strict;
 
 @EXPORT  = qw(%NetConfig);
 @ISA     = qw(Net::LocalCfg Exporter);
-$VERSION = "1.09"; # $Id: //depot/libnet/Net/Config.pm#16 $
+$VERSION = "1.10"; # $Id: //depot/libnet/Net/Config.pm#17 $
 
 eval { local $SIG{__DIE__}; require Net::LocalCfg };
 
@@ -36,24 +36,24 @@ eval { local $SIG{__DIE__}; require Net::LocalCfg };
 #
 # Try to get as much configuration info as possible from InternetConfig
 #
-$^O eq 'MacOS' and eval <<'TRY_INTERNET_CONFIG';
+$^O eq 'MacOS' and eval <<TRY_INTERNET_CONFIG;
 use Mac::InternetConfig;
 
 {
 my %nc = (
-    nntp_hosts      => [ $InternetConfig{ kICNNTPHost()} ],
-    pop3_hosts      => [ $InternetConfig{ kICMailAccount()} =~ /@(.*)/ ],
-    smtp_hosts      => [ $InternetConfig{ kICSMTPHost()} ],
-    ftp_testhost    => [ $InternetConfig{ kICFTPHost()}  ],
-    ph_hosts        => [ $InternetConfig{ kICPhHost()}   ],
-    ftp_ext_passive => $InternetConfig{"646F676F€UsePassiveMode"} || 0,
-    ftp_int_passive => $InternetConfig{"646F676F€UsePassiveMode"} || 0,
+    nntp_hosts      => [ \$InternetConfig{ kICNNTPHost() } ],
+    pop3_hosts      => [ \$InternetConfig{ kICMailAccount() } =~ /\@(.*)/ ],
+    smtp_hosts      => [ \$InternetConfig{ kICSMTPHost() } ],
+    ftp_testhost    => \$InternetConfig{ kICFTPHost() } ? \$InternetConfig{ kICFTPHost()} : undef,
+    ph_hosts        => [ \$InternetConfig{ kICPhHost() }   ],
+    ftp_ext_passive => \$InternetConfig{"646F676F\xA5UsePassiveMode"} || 0,
+    ftp_int_passive => \$InternetConfig{"646F676F\xA5UsePassiveMode"} || 0,
     socks_hosts     => 
-    	$InternetConfig{kICUseSocks()}    ? [ $InternetConfig{kICSocksHost()}    ] : [],
+    	\$InternetConfig{ kICUseSocks() }    ? [ \$InternetConfig{ kICSocksHost() }    ] : [],
     ftp_firewall    => 
-    	$InternetConfig{kICUseFTPProxy()} ? [ $InternetConfig{kICFTPProxyHost()} ] : [],
+    	\$InternetConfig{ kICUseFTPProxy() } ? [ \$InternetConfig{ kICFTPProxyHost() } ] : [],
 );
-@NetConfig{keys %nc} = values %nc;
+\@NetConfig{keys %nc} = values %nc;
 }
 TRY_INTERNET_CONFIG
 
@@ -309,6 +309,6 @@ If true then C<Configure> will check each hostname given that it exists
 
 =for html <hr>
 
-I<$Id: //depot/libnet/Net/Config.pm#16 $>
+I<$Id: //depot/libnet/Net/Config.pm#17 $>
 
 =cut
-- 
cgit v1.2.3-24-ge0c7