Changeset 14408

Timestamp:

2007-09-03T16:29:15+12:00 (17 years ago)

Author:

qq6

Message:

fixed a bug of defining userdbclass and keydbclass

File:

• gsdl/tags/gsdl-2_74-distribution/src/w32server/cgiwrapper.cpp (modified) (2 diffs)

gsdl/tags/gsdl-2_74-distribution/src/w32server/cgiwrapper.cpp

@@ -356 +356 @@
 htmlbrowserclass *ahtmlbrowserclass = NULL;
 phindbrowserclass *aphindbrowserclass = NULL;
-text_t userdbfile = NULL;
-userdbclass *udb = NULL;
-text_t keydbfile = NULL;
-keydbclass *kdb = NULL;
 
 // returns 1 if successful, 0 if unsuccessful (note that as well as being
@@ -495 +491 @@
   nproto.set_collectset(cservers);
   
-  if ((ausersaction == NULL) && (aauthenaction == NULL)){
-    userdbfile = filename_cat(gsdl_gsdlhome, "etc", "users.db");
-    udb = new userdbclass(userdbfile);
-    keydbfile = filename_cat(gsdl_gsdlhome, "etc", "key.db");
-    kdb = new keydbclass(keydbfile);
-  }
+  text_t userdbfile = filename_cat(gsdl_gsdlhome, "etc", "users.db");
+  userdbclass *udb = new userdbclass(userdbfile);
+
+  text_t keydbfile = filename_cat(gsdl_gsdlhome, "etc", "key.db");
+  keydbclass *kdb = new keydbclass(keydbfile);
+
   // add the protocol to the receptionist
   if (atStartup) recpt.add_protocol (&nproto);