--- loncom/lond	2002/09/19 21:16:24	1.98
+++ loncom/lond	2002/09/30 21:38:18	1.100
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.98 2002/09/19 21:16:24 foxr Exp $
+# $Id: lond,v 1.100 2002/09/30 21:38:18 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -695,15 +695,22 @@ sub make_new_child {
                           my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
                           my $pwdcorrect=0;
                           if ($howpwd eq 'internal') {
+			      &Debug("Internal auth");
 			      $pwdcorrect=
 				  (crypt($upass,$contentpwd) eq $contentpwd);
                           } elsif ($howpwd eq 'unix') {
-                              $contentpwd=(getpwnam($uname))[1];
-			      my $pwauth_path="/usr/local/sbin/pwauth";
-			      unless ($contentpwd eq 'x') {
-				  $pwdcorrect=
-                                    (crypt($upass,$contentpwd) eq $contentpwd);
-			      }
+			      &Debug("Unix auth");
+                              if((getpwnam($uname))[1] eq "") { #no such user!
+				  $pwdcorrect = 0;
+			      } else {
+				  $contentpwd=(getpwnam($uname))[1];
+				  my $pwauth_path="/usr/local/sbin/pwauth";
+				  unless ($contentpwd eq 'x') {
+				      $pwdcorrect=
+					  (crypt($upass,$contentpwd) eq 
+					   $contentpwd);
+				  }
+		  
 			      elsif (-e $pwauth_path) {
 				  open PWAUTH, "|$pwauth_path" or
 				      die "Cannot invoke authentication";
@@ -711,6 +718,7 @@ sub make_new_child {
 				  close PWAUTH;
 				  $pwdcorrect=!$?;
 			      }
+			      }
                           } elsif ($howpwd eq 'krb4') {
                              $null=pack("C",0);
 			     unless ($upass=~/$null/) {
@@ -1216,21 +1224,25 @@ sub make_new_child {
 		       } else {
                           $regexp='.';
 		       }
-                       my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
+                       my $proname=propath($udom,$uname);
+    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
                            study($regexp);
-                           foreach $key (keys %hash) {
-                               my $unescapeKey = &unescape($key);
-                               if (eval('$unescapeKey=~/$regexp/')) {
-                                  $qresult.="$key=$hash{$key}&";
-                              }
+                           while (($key,$value) = each(%hash)) {
+                               if ($regexp eq '.') {
+                                   $qresult.=$key.'='.$value.'&';
+                               } else {
+                                   my $unescapeKey = &unescape($key);
+                                   if (eval('$unescapeKey=~/$regexp/')) {
+                                       $qresult.="$key=$value&";
+                                   }
+                               }
                            }
-			   if (untie(%hash)) {
-		              $qresult=~s/\&$//;
-                              print $client "$qresult\n";
+                           if (untie(%hash)) {
+                               chop($qresult);
+                               print $client "$qresult\n";
                            } else {
-                              print $client "error:$!\n";
+                               print $client "error:$!\n";
                            }
                        } else {
                            print $client "error:$!\n";