From raeburn at source.lon-capa.org Mon Jul 25 19:31:40 2022 From: raeburn at source.lon-capa.org (raeburn) Date: Mon, 25 Jul 2022 23:31:40 -0000 Subject: [LON-CAPA-cvs] cvs: loncom / lond Message-ID: raeburn Mon Jul 25 23:31:40 2022 EDT Modified files: /loncom lond Log: - Typo Index: loncom/lond diff -u loncom/lond:1.575 loncom/lond:1.576 --- loncom/lond:1.575 Sun Feb 27 01:43:13 2022 +++ loncom/lond Mon Jul 25 23:31:40 2022 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.575 2022/02/27 01:43:13 raeburn Exp $ +# $Id: lond,v 1.576 2022/07/25 23:31:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,7 +65,7 @@ my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.575 $'; #' stupid emacs +my $VERSION='$Revision: 1.576 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -865,7 +865,7 @@ if($filename eq "host") { $contents = AdjustHostContents($contents); - } elsif (($filename eq 'dns_host') || ($filename eq 'dns_domain') || + } elsif (($filename eq 'dns_hosts') || ($filename eq 'dns_domain') || ($filename eq 'loncapaCAcrl')) { if ($contents eq '') { &logthis(' Pushfile: unable to install ' From raeburn at source.lon-capa.org Mon Jul 25 21:11:43 2022 From: raeburn at source.lon-capa.org (raeburn) Date: Tue, 26 Jul 2022 01:11:43 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm Message-ID: raeburn Tue Jul 26 01:11:43 2022 EDT Modified files: /loncom/interface domainprefs.pm Log: - Prevent ISE in unconfigured domain. Index: loncom/interface/domainprefs.pm diff -u loncom/interface/domainprefs.pm:1.410 loncom/interface/domainprefs.pm:1.411 --- loncom/interface/domainprefs.pm:1.410 Wed Jun 8 03:36:07 2022 +++ loncom/interface/domainprefs.pm Tue Jul 26 01:11:43 2022 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.410 2022/06/08 03:36:07 raeburn Exp $ +# $Id: domainprefs.pm,v 1.411 2022/07/26 01:11:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1634,7 +1634,7 @@ $styleon{$lonhost} = 'display:none'; $styleoff{$lonhost} = ''; } - if (ref($settings->{'saml'}) eq 'HASH') { + if ((ref($settings) eq 'HASH') && (ref($settings->{'saml'}) eq 'HASH')) { foreach my $lonhost (keys(%{$settings->{'saml'}})) { if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') { $saml{$lonhost} = 1;