[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /auth lonauth.pm
raeburn
raeburn@source.lon-capa.org
Wed, 18 Aug 2010 19:39:42 -0000
raeburn Wed Aug 18 19:39:42 2010 EDT
Modified files: (Branch: version_2_10_X)
/loncom/auth lonauth.pm
Log:
- Backport 1.108.
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.101.8.2 loncom/auth/lonauth.pm:1.101.8.3
--- loncom/auth/lonauth.pm:1.101.8.2 Thu Aug 12 21:31:10 2010
+++ loncom/auth/lonauth.pm Wed Aug 18 19:39:42 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.101.8.2 2010/08/12 21:31:10 raeburn Exp $
+# $Id: lonauth.pm,v 1.101.8.3 2010/08/18 19:39:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -435,7 +435,11 @@
my $canhost = 1;
my $lonhost = $r->dir_config('lonHostID');
my $udom = $form->{'udom'};
- my @intdoms = &Apache::lonnet::get_internet_names($lonhost);
+ my @intdoms;
+ my $internet_names = &Apache::lonnet::get_internet_names($lonhost);
+ if (ref($internet_names) eq 'ARRAY') {
+ @intdoms = @{$internet_names};
+ }
my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {