--- loncom/lonnet/perl/lonnet.pm	2010/08/30 17:22:20	1.976.2.11
+++ loncom/lonnet/perl/lonnet.pm	2009/09/16 20:02:48	1.976.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.976.2.11 2010/08/30 17:22:20 raeburn Exp $
+# $Id: lonnet.pm,v 1.976.4.1 2009/09/16 20:02:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -748,8 +748,7 @@ sub changepass {
     my ($uname,$udom,$currentpass,$newpass,$server,$context)=@_;
     $currentpass = &escape($currentpass);
     $newpass     = &escape($newpass);
-    my $lonhost = $perlvar{'lonHostID'};
-    my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass:$context:$lonhost",
+    my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass:$context",
 		       $server);
     if (! $answer) {
 	&logthis("No reply on password change request to $server ".
@@ -774,9 +773,6 @@ sub changepass {
     } elsif ($answer =~ "^refused") {
 	&logthis("$server refused to change $uname in $udom password because ".
 		 "it was sent an unencrypted request to change the password.");
-    } elsif ($answer =~ "invalid_client") {
-        &logthis("$server refused to change $uname in $udom password because ".
-                 "it was a reset by e-mail originating from an invalid server.");
     }
     return $answer;
 }
@@ -5152,7 +5148,8 @@ sub update_allusers_table {
                'generation='.&escape($names->{'generation'}).'%%'.
                'permanentemail='.&escape($names->{'permanentemail'}).'%%'.
                'id='.&escape($names->{'id'}),$homeserver);
-    return;
+    my $reply = &get_query_reply($queryid);
+    return $reply;
 }
 
 # ------- Request retrieval of institutional classlists for course(s)