X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FNet%2FConfig.pm;h=8984ed7889a967f183e48ef04da9016e282788d9;hb=9c36735de2bc373cab0c4275429b13fc1c754d20;hp=db503b58762b44284604e4b241be15c70b3aa2d9;hpb=686337f3173d259f9dc05f9d6c19a8c95e2cb00b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Net/Config.pm b/lib/Net/Config.pm
index db503b5..8984ed7 100644
--- a/lib/Net/Config.pm
+++ b/lib/Net/Config.pm
@@ -13,7 +13,7 @@ use strict;
 
 @EXPORT  = qw(%NetConfig);
 @ISA     = qw(Net::LocalCfg Exporter);
-$VERSION = "1.05"; # $Id: //depot/libnet/Net/Config.pm#9 $
+$VERSION = "1.10"; # $Id: //depot/libnet/Net/Config.pm#17 $
 
 eval { local $SIG{__DIE__}; require Net::LocalCfg };
 
@@ -33,32 +33,57 @@ eval { local $SIG{__DIE__}; require Net::LocalCfg };
     test_exist => 1,
 );
 
+#
+# Try to get as much configuration info as possible from InternetConfig
+#
+$^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() } ? \$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() }    ] : [],
+    ftp_firewall    => 
+    	\$InternetConfig{ kICUseFTPProxy() } ? [ \$InternetConfig{ kICFTPProxyHost() } ] : [],
+);
+\@NetConfig{keys %nc} = values %nc;
+}
+TRY_INTERNET_CONFIG
+
 my $file = __FILE__;
 my $ref;
 $file =~ s/Config.pm/libnet.cfg/;
 if ( -f $file ) {
-    $ref = eval { do $file };
+    $ref = eval { local $SIG{__DIE__}; do $file };
     if (ref($ref) eq 'HASH') {
 	%NetConfig = (%NetConfig, %{ $ref });
 	$LIBNET_CFG = $file;
     }
 }
 if ($< == $> and !$CONFIGURE)  {
-    my $home = eval { (getpwuid($>))[7] } || $ENV{HOME};
+    my $home = eval { local $SIG{__DIE__}; (getpwuid($>))[7] } || $ENV{HOME};
+    $home ||= $ENV{HOMEDRIVE} . ($ENV{HOMEPATH}||'') if defined $ENV{HOMEDRIVE};
     if (defined $home) {
 	$file = $home . "/.libnetrc";
-	$ref = eval { do $file } if -f $file;
+	$ref = eval { local $SIG{__DIE__}; do $file } if -f $file;
 	%NetConfig = (%NetConfig, %{ $ref })
 	    if ref($ref) eq 'HASH';	
     }
 }
 my ($k,$v);
 while(($k,$v) = each %NetConfig) {
-    $v = [ $v ]
-	if($k =~ /_hosts$/ && !ref($v));
+	$NetConfig{$k} = [ $v ]
+		if($k =~ /_hosts$/ and $k ne "test_hosts" and defined($v) and !ref($v));
 }
 
-# Take a hostname and determine if it is inside te firewall
+# Take a hostname and determine if it is inside the firewall
 
 sub requires_firewall {
     shift; # ignore package
@@ -107,8 +132,8 @@ C<Net::Config> holds configuration data for the modules in the libnet
 distribuion. During installation you will be asked for these values.
 
 The configuration data is held globally in a file in the perl installation
-tree, but a user may override any of these values by providing thier own. This
-can be done by having a C<.libnetrc> file in thier home directory. This file
+tree, but a user may override any of these values by providing their own. This
+can be done by having a C<.libnetrc> file in their home directory. This file
 should return a reference to a HASH containing the keys described below.
 For example
 
@@ -168,15 +193,15 @@ Your internet domain name
 
 =item ftp_firewall
 
-If you have an FTP proxy firewall (B<NOT> a HTTP or SOCKS firewall)
+If you have an FTP proxy firewall (B<NOT> an HTTP or SOCKS firewall)
 then this value should be set to the firewall hostname. If your firewall
 does not listen to port 21, then this value should be set to
 C<"hostname:port"> (eg C<"hostname:99">)
 
 =item ftp_firewall_type
 
-There are many different ftp firewall products avaliable. But unfortunately there
-is not standard for how to traverse a firewall.  The list below shows the
+There are many different ftp firewall products available. But unfortunately
+there is no standard for how to traverse a firewall.  The list below shows the
 sequence of commands that Net::FTP will use
 
   user        Username for remote host
@@ -248,14 +273,14 @@ FTP servers normally work on a non-passive mode. That is when you want to
 transfer data you have to tell the server the address and port to
 connect to.
 
-With some firewalls this does not work as te server cannot
-connect to your machine (because you are beind a firewall) and the firewall
-does not re-write te command. In this case you should set C<ftp_ext_passive>
+With some firewalls this does not work as the server cannot
+connect to your machine (because you are behind a firewall) and the firewall
+does not re-write the command. In this case you should set C<ftp_ext_passive>
 to a I<true> value.
 
 Some servers are configured to only work in passive mode. If you have
 one of these you can force C<Net::FTP> to always transfer in passive
-mode, when not going via a firewall, by cetting C<ftp_int_passive> to
+mode; when not going via a firewall, by setting C<ftp_int_passive> to
 a I<true> value.
 
 =item local_netmask
@@ -273,17 +298,17 @@ libnet package
 
 =item test_hosts
 
-If true them C<make test> may attempt to connect to hosts given in the
+If true then C<make test> may attempt to connect to hosts given in the
 configuration.
 
 =item test_exists
 
-If true the C<Configure> will check each hostname given that it exists
+If true then C<Configure> will check each hostname given that it exists
 
 =back
 
 =for html <hr>
 
-I<$Id: //depot/libnet/Net/Config.pm#9 $>
+I<$Id: //depot/libnet/Net/Config.pm#17 $>
 
 =cut