--- loncom/lond 2014/11/24 02:36:16 1.512 +++ loncom/lond 2015/06/14 00:43:51 1.516 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.512 2014/11/24 02:36:16 raeburn Exp $ +# $Id: lond,v 1.516 2015/06/14 00:43:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,7 +61,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.512 $'; #' stupid emacs +my $VERSION='$Revision: 1.516 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -2808,8 +2808,12 @@ sub newput_user_profile_entry { foreach my $pair (@pairs) { my ($key,$value)=split(/=/,$pair); if (exists($hashref->{$key})) { - &Failure($client, "key_exists: ".$key."\n",$userinput); - return 1; + if (!&untie_user_hash($hashref)) { + &logthis("error: ".($!+0)." untie (GDBM) failed ". + "while attempting newput - early out as key exists"); + } + &Failure($client, "key_exists: ".$key."\n",$userinput); + return 1; } } @@ -5406,7 +5410,7 @@ sub crsreq_update_handler { $title,$code,$accessstart,$accessend, $incoming,\%rtnhash); if ($outcome eq 'ok') { - my @posskeys = qw(createdweb createdmsg queuedweb queuedmsg formitems reviewweb); + my @posskeys = qw(createdweb createdmsg createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript); foreach my $key (keys(%rtnhash)) { if (grep(/^\Q$key\E/,@posskeys)) { $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&'; @@ -6625,7 +6629,7 @@ sub make_new_child { &Authen::Krb5::init_context(); my $no_ets; - if ($dist =~ /^(?:centos|rhes)(\d+)$/) { + if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) { if ($1 >= 7) { $no_ets = 1; } @@ -6633,6 +6637,10 @@ sub make_new_child { if (($1 eq '9.3') || ($1 >= 12.2)) { $no_ets = 1; } + } elsif ($dist =~ /^sles(\d+)$/) { + if ($1 > 11) { + $no_ets = 1; + } } elsif ($dist =~ /^fedora(\d+)$/) { if ($1 < 7) { $no_ets = 1; @@ -6683,7 +6691,6 @@ sub make_new_child { # # If the remote is attempting a local init... give that a try: # - logthis("remotereq: $remotereq"); (my $i, my $inittype, $clientversion) = split(/:/, $remotereq); # For LON-CAPA 2.9, the client session will have sent its LON-CAPA # version when initiating the connection. For LON-CAPA 2.8 and older,