--- loncom/lonnet/perl/lonnet.pm 2013/02/02 00:22:47 1.1210 +++ loncom/lonnet/perl/lonnet.pm 2013/02/05 21:32:49 1.1212 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1210 2013/02/02 00:22:47 raeburn Exp $ +# $Id: lonnet.pm,v 1.1212 2013/02/05 21:32:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -634,6 +634,13 @@ sub check_for_valid_session { || !defined($disk_env{'user.domain'})) { return undef; } + if ($r->user() eq '') { + if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) { + $r->user($disk_env{'user.name'}); + } else { + $r->user($disk_env{'user.name'}.':'.$disk_env{'user.domain'}); + } + } return $handle; } @@ -11602,7 +11609,7 @@ sub get_dns { } # ------------------------------------------------------Get DNS checksums file -sub write_dns_checksums_tab { +sub parse_dns_checksums_tab { my ($lines,$hashref) = @_; my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'}); my $loncaparev = &get_server_loncaparev($machine_dom); @@ -11648,8 +11655,8 @@ sub write_dns_checksums_tab { sub fetch_dns_checksums { my %checksums; - &get_dns('/adm/dns/checksums',\&write_dns_checksums_tab,1,1, - \%checksums); + &get_dns('/adm/dns/checksums',\&parse_dns_checksums_tab,1,1, + \%checksums); return \%checksums; }