Changeset 24017 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2011-05-13T20:59:44+12:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the bug on Windows whereby the Admin pages when accessed through the local library server/server.exe would not authenticate (but the authentication would work if the apache web server was run instead).

File:

• main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp

@@ -370 +370 @@
 htmlbrowserclass *ahtmlbrowserclass = NULL;
 phindbrowserclass *aphindbrowserclass = NULL;
-text_t userdbfile = NULL;
 userdbclass *udb = NULL;
-text_t keydbfile = NULL;
 keydbclass *kdb = NULL;
 
@@ -554 +552 @@
   
   if ((ausersaction == NULL) && (aauthenaction == NULL)){
-    userdbfile = filename_cat(gsdl_gsdlhome, "etc", "users.gdb");
-    udb = new userdbclass(userdbfile);
-    keydbfile = filename_cat(gsdl_gsdlhome, "etc", "key.gdb");
-    kdb = new keydbclass(keydbfile);
+    udb = new userdbclass(gsdl_gsdlhome);
+    kdb = new keydbclass(gsdl_gsdlhome);
   }
   // add the protocol to the receptionist