--- loncom/lond	2005/02/06 07:39:49	1.277
+++ loncom/lond	2005/03/03 23:21:51	1.280
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.277 2005/02/06 07:39:49 albertel Exp $
+# $Id: lond,v 1.280 2005/03/03 23:21:51 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.277 $'; #' stupid emacs
+my $VERSION='$Revision: 1.280 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1409,6 +1409,9 @@ sub du_handler {
 &register_handler("du", \&du_handler, 0, 1, 0);
 
 #
+# The ls_handler routine should be considered obosolete and is retained
+# for communication with legacy servers.  Please see the ls2_handler.
+#
 #   ls  - list the contents of a directory.  For each file in the
 #    selected directory the filename followed by the full output of
 #    the stat function is returned.  The returned info for each
@@ -1425,6 +1428,7 @@ sub du_handler {
 #   The reply is written to  $client.
 #
 sub ls_handler {
+    # obsoleted by ls2_handler
     my ($cmd, $ulsdir, $client) = @_;
 
     my $userinput = "$cmd:$ulsdir";
@@ -1471,6 +1475,72 @@ sub ls_handler {
 }
 &register_handler("ls", \&ls_handler, 0, 1, 0);
 
+#
+# Please also see the ls_handler, which this routine obosolets.
+# ls2_handler differs from ls_handler in that it escapes its return 
+# values before concatenating them together with ':'s.
+#
+#   ls2  - list the contents of a directory.  For each file in the
+#    selected directory the filename followed by the full output of
+#    the stat function is returned.  The returned info for each
+#    file are separated by ':'.  The stat fields are separated by &'s.
+# Parameters:
+#    $cmd        - The command that dispatched us (ls).
+#    $ulsdir     - The directory path to list... I'm not sure what this
+#                  is relative as things like ls:. return e.g.
+#                  no_such_dir.
+#    $client     - Socket open on the client.
+# Returns:
+#     1 - indicating that the daemon should not disconnect.
+# Side Effects:
+#   The reply is written to  $client.
+#
+sub ls2_handler {
+    my ($cmd, $ulsdir, $client) = @_;
+
+    my $userinput = "$cmd:$ulsdir";
+
+    my $obs;
+    my $rights;
+    my $ulsout='';
+    my $ulsfn;
+    if (-e $ulsdir) {
+        if(-d $ulsdir) {
+            if (opendir(LSDIR,$ulsdir)) {
+                while ($ulsfn=readdir(LSDIR)) {
+                    undef $obs, $rights; 
+                    my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+                    #We do some obsolete checking here
+                    if(-e $ulsdir.'/'.$ulsfn.".meta") { 
+                        open(FILE, $ulsdir.'/'.$ulsfn.".meta");
+                        my @obsolete=<FILE>;
+                        foreach my $obsolete (@obsolete) {
+                            if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+                            if($obsolete =~ m|(<copyright>)(default)|) {
+                                $rights = 1;
+                            }
+                        }
+                    }
+                    my $tmp = $ulsfn.'&'.join('&',@ulsstats);
+                    if ($obs    eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+                    if ($rights eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+                    $ulsout.= &escape($tmp).':';
+                }
+                closedir(LSDIR);
+            }
+        } else {
+            my @ulsstats=stat($ulsdir);
+            $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+        }
+    } else {
+        $ulsout='no_such_dir';
+   }
+   if ($ulsout eq '') { $ulsout='empty'; }
+   &Reply($client, "$ulsout\n", $userinput); # This supports debug logging.
+   return 1;
+}
+&register_handler("ls2", \&ls2_handler, 0, 1, 0);
+
 #   Process a reinit request.  Reinit requests that either
 #   lonc or lond be reinitialized so that an updated 
 #   host.tab or domain.tab can be processed.
@@ -4282,7 +4352,7 @@ sub ReadHostTable {
 	if ($configline !~ /^\s*\#/ && $configline !~ /^\s*$/ ) {
 	    my ($id,$domain,$role,$name)=split(/:/,$configline);
 	    $name=~s/\s//g;
-	    my (undef,undef,undef,undef,$ip) = gethostbyname($name);
+	    my $ip = gethostbyname($name);
 	    if (length($ip) ne 4) {
 		&logthis("Skipping host $id name $name no IP $ip found\n");
 		next;
@@ -4741,18 +4811,23 @@ sub make_new_child {
 
 	ReadManagerTable;	# May also be a manager!!
 	
-	my $clientrec=($hostid{$clientip}     ne undef);
-	my $ismanager=($managers{$clientip}    ne undef);
+	my $outsideip=$clientip;
+	if ($clientip eq '127.0.0.1') {
+	    $outsideip=$hostip{$perlvar{'lonHostID'}};
+	}
+
+	my $clientrec=($hostid{$outsideip}     ne undef);
+	my $ismanager=($managers{$outsideip}    ne undef);
 	$clientname  = "[unknonwn]";
 	if($clientrec) {	# Establish client type.
 	    $ConnectionType = "client";
-	    $clientname = $hostid{$clientip};
+	    $clientname = $hostid{$outsideip};
 	    if($ismanager) {
 		$ConnectionType = "both";
 	    }
 	} else {
 	    $ConnectionType = "manager";
-	    $clientname = $managers{$clientip};
+	    $clientname = $managers{$outsideip};
 	}
 	my $clientok;