From a097a0793730ccd00519f334b93f82136c39ca38 Mon Sep 17 00:00:00 2001 From: hns Date: Mon, 5 Aug 2002 16:39:18 +0000 Subject: [PATCH] Re-enable server-wide passwd file for the authenticate() function. --- src/helma/framework/core/Application.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/helma/framework/core/Application.java b/src/helma/framework/core/Application.java index 9739c03a..df388f25 100644 --- a/src/helma/framework/core/Application.java +++ b/src/helma/framework/core/Application.java @@ -162,6 +162,7 @@ public final class Application // system-wide properties, default to null Properties sysProps, sysDbProps; sysProps = sysDbProps = null; + home = null; if (server != null) { home = server.getHopHome (); @@ -197,10 +198,10 @@ public final class Application dbProps = new SystemProperties (dbpropfile.getAbsolutePath (), sysDbProps); // the passwd file, to be used with the authenticate() function - // File pwf = new File (home, "passwd"); - // CryptFile parentpwfile = new CryptFile (pwf, null); - File pwf = new File (appDir, "passwd"); - CryptFile pwfile = new CryptFile (pwf, null); + CryptFile parentpwfile = null; + if (home != null) + parentpwfile = new CryptFile (new File (home, "passwd"), null); + CryptFile pwfile = new CryptFile (new File (appDir, "passwd"), parentpwfile); // the properties that map java class names to prototype names File classMappingFile = new File (appDir, "class.properties");