--- loncom/lonhttpd	2007/04/10 20:08:01	1.11
+++ loncom/lonhttpd	2008/05/01 14:36:03	1.16
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: lonhttpd,v 1.11 2007/04/10 20:08:01 raeburn Exp $
+# $Id: lonhttpd,v 1.16 2008/05/01 14:36:03 raeburn Exp $
 
 $VERSION = "1.3.2 (Demonic/Linux/LON-CAPA Derivative $Revison$)";
 
@@ -356,15 +356,9 @@ while (<STDIN>) {
 	$address=~s/\/+/\//g;
         if ($address=~/^\/(status|adm\/|res\/adm\/)/) {
             $fail = 0;
-        } elsif ($address =~ /^\/res\/([^\/]+)\/([^\/]+)\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) {
-#            FIXME - should check $1 is a real domain here - need a lightweight
-#                    domain checker.
-#            @alldomains = &Apache::lonnet::get_domains();
-#            if (grep(/^\Q$1\E$/,@alldomains)) {
-                $fail = 0;
-#            }
+        } elsif ($address =~ /^\/res\/([\w\.\-]+)\/\1\-domainconfig\/(logo|domlogo|img|login)\/[^\/]+$/) {
+            $fail = 0;
         }
-
 #
 # because existing restriction matrix would not do precedence across rules
 #
@@ -601,6 +595,7 @@ for (;;) {
 		waitpid($pid, 0);
 		$0 = "lonhttpd: (dhttpi) on ANY:$port_to_use, last request " .
 			scalar localtime;
+		close(NS);
 	} else {
 		$0 = "lonhttpd: (dhttpi) child switching to socket";
 		open(STDIN, "<&NS");