--- loncom/lond	2008/10/07 10:08:06	1.409
+++ loncom/lond	2009/02/10 11:31:26	1.411
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.409 2008/10/07 10:08:06 foxr Exp $
+# $Id: lond,v 1.411 2009/02/10 11:31:26 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.409 $'; #' stupid emacs
+my $VERSION='$Revision: 1.411 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -562,8 +562,13 @@ sub InstallFile {
 
 #
 #   ConfigFileFromSelector: converts a configuration file selector
-#                 (one of host or domain at this point) into a 
-#                 configuration file pathname.
+#                 into a configuration file pathname.
+#                 It's probably no longer necessary to preserve
+#                 special handling of hosts or domain as those
+#                 files have been superceded by dns_hosts, dns_domain.
+#                 The default action is just to prepend the directory
+#                 and append .tab
+#
 #
 #  Parameters:
 #      selector  - Configuration file selector.
@@ -580,7 +585,7 @@ sub ConfigFileFromSelector {
     } elsif ($selector eq "domain") {
 	$tablefile = $tabledir."domain.tab";
     } else {
-	return undef;
+	$tablefile =  $tabledir.$selector.'.tab';
     }
     return $tablefile;
 
@@ -1587,6 +1592,38 @@ sub ls3_handler {
 }
 &register_handler("ls3", \&ls3_handler, 0, 1, 0);
 
+sub server_timezone_handler {
+    my ($cmd,$tail,$client) = @_;
+    my $userinput = "$cmd:$tail";
+    my $timezone;
+    my $clockfile = '/etc/sysconfig/clock'; # Fedora/CentOS/SuSE
+    my $tzfile = '/etc/timezone'; # Debian/Ubuntu
+    if (-e $clockfile) {
+        if (open(my $fh,"<$clockfile")) {
+            while (<$fh>) {
+                next if (/^[\#\s]/);
+                if (/^(?:TIME)?ZONE\s*=\s*['"]?\s*([\w\/]+)/) {
+                    $timezone = $1;
+                    last;
+                }
+            }
+            close($fh);
+        }
+    } elsif (-e $tzfile) {
+        if (open(my $fh,"<$tzfile")) {
+            $timezone = <$fh>;
+            close($fh);
+            chomp($timezone);
+            if ($timezone =~ m{^Etc/(\w+)$}) {
+                $timezone = $1;
+            }
+        }
+    }
+    &Reply($client,\$timezone,$userinput); # This supports debug logging.
+    return 1;
+}
+&register_handler("servertimezone", \&server_timezone_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.