--- loncom/lond 2009/12/03 17:43:19 1.434 +++ loncom/lond 2010/02/21 02:02:51 1.437 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.434 2009/12/03 17:43:19 www Exp $ +# $Id: lond,v 1.437 2010/02/21 02:02:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,7 +59,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.434 $'; #' stupid emacs +my $VERSION='$Revision: 1.437 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -3129,7 +3129,7 @@ sub dump_with_regexp { if ($clientversion =~ /^(\d+)\.(\d+)$/) { my $major = $1; my $minor = $2; - next if (($major < 2) || (($major == 2) && ($minor < 10))); + next if (($major < 2) || (($major == 2) && ($minor < 9))); } } } @@ -3870,6 +3870,19 @@ sub dump_course_id_handler { $items->{'cloners'} = $cloneruname.':'.$clonerudom; $valchange = 1; } + unless ($canclone) { + if ($items->{'owner'} =~ /:/) { + if ($items->{'owner'} eq $cloner) { + $canclone = 1; + } + } elsif ($cloner eq $udom.':'.$items->{'owner'}) { + $canclone = 1; + } + if ($canclone) { + $items->{'cloners'} = $cloneruname.':'.$clonerudom; + $valchange = 1; + } + } } } if ($unpack || !$rtn_as_hash) { @@ -6553,9 +6566,7 @@ sub rewrite_password_file { # Returns the authorization type or nouser if there is no such user. # -sub get_auth_type -{ - +sub get_auth_type { my ($domain, $user) = @_; Debug("get_auth_type( $domain, $user ) \n");