loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

-version 1.872, 2007/05/02 22:00:02
+version 1.873, 2007/05/11 01:48:19
  Line 4486  sub auto_validate_courseID {
  }
  sub auto_create_password {
-     my ($cnum,$cdom,$authparam) = @_;
+     my ($cnum,$cdom,$authparam,$udom) = @_;
-     my $homeserver = &homeserver($cnum,$cdom);
+     my ($homeserver,$response);
      my $create_passwd = 0;
      my $authchk = '';
-     my $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver));
+     if ($udom =~ /^$match_domain$/) {
-     if ($response eq 'refused') {
+         $homeserver = &domain($udom,'primary');
-         $authchk = 'refused';
+     }
+     if ($homeserver eq '') {
+         if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) {
+             $homeserver = &homeserver($cnum,$cdom);
+         }
+     }
+     if ($homeserver eq '') {
+         $authchk = 'nodomain';
      } else {
-         ($authparam,$create_passwd,$authchk) = split/:/,$response;
+         $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver));
+         if ($response eq 'refused') {
+             $authchk = 'refused';
+         } else {
+             ($authparam,$create_passwd,$authchk) = split/:/,$response;
+         }
      }
      return ($authparam,$create_passwd,$authchk);
  }