[LON-CAPA-cvs] cvs: loncom(Refactoring) / lond

[foxr]

foxr		Mon Mar 22 04:41:53 2004 EDT

  Modified files:              (Branch: Refactoring)
    /loncom	lond 
  Log:
  fix problemwith PasswordPath..extra my masked existing result.
  
  
Index: loncom/lond
diff -u loncom/lond:1.178.2.10 loncom/lond:1.178.2.11
--- loncom/lond:1.178.2.10	Mon Mar 22 04:16:26 2004
+++ loncom/lond	Mon Mar 22 04:41:53 2004
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.178.2.10 2004/03/22 09:16:26 foxr Exp $
+# $Id: lond,v 1.178.2.11 2004/03/22 09:41:53 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.178.2.10 $'; #' stupid emacs
+my $VERSION='$Revision: 1.178.2.11 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -3900,11 +3900,14 @@
 
 sub propath {
     my ($udom,$uname)=@_;
+    Debug("Propath:$udom:$uname");
     $udom=~s/\W//g;
     $uname=~s/\W//g;
+    Debug("Propath2:$udom:$uname");
     my $subdir=$uname.'__';
     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
     my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+    Debug("Propath returning $proname");
     return $proname;
 } 
 
@@ -4162,7 +4165,7 @@
     my $user   = shift;
 
     my $path   = &propath($domain, $user);
-    my $path  .= "/passwd";
+    $path  .= "/passwd";
 
     return $path;
 }
@@ -4181,8 +4184,10 @@
     my $domain    = shift;
     my $user      = shift;
 
-    my $path  = PasswordPath($domain, $user);
+    Debug ("PasswordFilename called: dom = $domain user = $user");
 
+    my $path  = PasswordPath($domain, $user);
+    Debug("PasswordFilename got path: $path");
     if(-e $path) {
 	return $path;
     } else {