--- loncom/enrollment/Autoupdate.pl	2011/10/14 17:13:25	1.20
+++ loncom/enrollment/Autoupdate.pl	2011/10/14 18:14:31	1.21
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Automated Userinfo update script
-# $Id: Autoupdate.pl,v 1.20 2011/10/14 17:13:25 raeburn Exp $
+# $Id: Autoupdate.pl,v 1.21 2011/10/14 18:14:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,7 @@
         # get user information
         my (%users,%instusers,%instids);
         my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom;
-        &descend_tree($dir,0,\%users,\%courses);
+        &descend_tree($dom,$dir,0,\%users,\%courses);
         next if (&localenroll::allusers_info($dom,\%instusers,\%instids,\%users) ne 'ok');
         my (%unamechg,%possnames);
         my @types = ('active','future');
@@ -184,7 +184,7 @@
     }
 
 sub descend_tree {
-    my ($dir,$depth,$alldomusers,$coursesref) = @_;
+    my ($dom,$dir,$depth,$alldomusers,$coursesref) = @_;
     if (-d $dir) {
         opendir(DIR,$dir);
         my @contents = grep(!/^\./,readdir(DIR));
@@ -192,10 +192,10 @@ sub descend_tree {
         $depth ++;
         foreach my $item (@contents) {
             if ($depth < 4) {
-                &descend_tree($dir.'/'.$item,$depth,$alldomusers,$coursesref);
+                &descend_tree($dom,$dir.'/'.$item,$depth,$alldomusers,$coursesref);
             } elsif (-e $dir.'/'.$item.'/passwd') {
                 if (ref($coursesref) eq 'HASH') {
-                    next if (exists($coursesref->{$item}));
+                    next if (exists($coursesref->{$dom.'_'.$item}));
                 }
                 $$alldomusers{$item} = '';
             }