--- loncom/lonnet/perl/lonnet.pm	2007/05/14 09:38:59	1.875
+++ loncom/lonnet/perl/lonnet.pm	2007/05/14 17:35:08	1.876
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.875 2007/05/14 09:38:59 albertel Exp $
+# $Id: lonnet.pm,v 1.876 2007/05/14 17:35:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4454,8 +4454,18 @@ sub userlog_query {
 
 sub auto_run {
     my ($cnum,$cdom) = @_;
-    my $homeserver = &homeserver($cnum,$cdom);
-    my $response = &reply('autorun:'.$cdom,$homeserver);
+    my $response = 0;
+    my $settings;
+    my %domconfig = &get_dom('configuration',['autoenroll'],$cdom);
+    if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+        $settings = $domconfig{'autoenroll'};
+        if ($settings->{'run'} eq '1') {
+            $response = 1;
+        }
+    } else {
+        my $homeserver = &homeserver($cnum,$cdom);
+        $response = &reply('autorun:'.$cdom,$homeserver);
+    }
     return $response;
 }