--- loncom/auth/lonauth.pm	2007/10/01 23:56:14	1.89
+++ loncom/auth/lonauth.pm	2008/03/24 05:23:10	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.89 2007/10/01 23:56:14 albertel Exp $
+# $Id: lonauth.pm,v 1.90 2008/03/24 05:23:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Crypt::DES;
 use Apache::loncommon();
 use Apache::lonnet;
 use Apache::lonmenu();
+use Apache::createaccount;
 use Fcntl qw(:flock);
 use Apache::lonlocal;
  
@@ -263,9 +264,21 @@ ENDFAILED
     }
 
 # ---------------------------------------------------------------- Authenticate
-    my $authhost=Apache::lonnet::authenticate($form{'uname'},
-                                              $upass,
-                                              $form{'udom'});
+    my $cancreate; 
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
+    if (ref($domconfig{'usercreation'}) eq 'HASH') {
+        if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+            if ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') {
+                $cancreate = $domconfig{'usercreation'}{'cancreate'}{'selfcreate'};
+            }
+        }
+    }
+    my $defaultauth;
+    if ($cancreate eq 'any' || $cancreate eq 'login') {  
+        $defaultauth = 1;
+    }
+    my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
+                                              $form{'udom'},$defaultauth);
     
 # --------------------------------------------------------------------- Failed?
 
@@ -273,6 +286,34 @@ ENDFAILED
 	&failed($r,'Username and/or password could not be authenticated.',
 		\%form);
         return OK;
+    } elsif ($authhost eq 'no_account_on_host') {
+        my $cancreate;
+        my %domconfig = 
+            &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
+        if (ref($domconfig{'usercreation'}) eq 'HASH') {
+            if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+                if ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') {
+                    $cancreate = $domconfig{'usercreation'}{'cancreate'}{'selfcreate'};
+                }
+            }
+        }
+        if ($cancreate eq 'any' || $cancreate eq 'login') {
+            my $start_page = 
+                &Apache::loncommon::start_page('Create a user account in LON-CAPA',
+                                               '',{'no_inline_link'   => 1,});
+            my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
+            my $output = &Apache::createaccount::username_check($form{'uname'},
+                                                                $form{'udom'},$domdesc);
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
+            &Apache::createaccount::print_header($r,$start_page);
+            $r->print($output);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);
+            return OK;
+        }
     }
 
     if (($firsturl eq '') ||