Changeset 14270 for gsdl/branches/gsdl-2.74/src/recpt/librarymain.cpp

Timestamp:

2007-07-25T13:37:52+12:00 (17 years ago)

Author:

oranfry

Message:

merged selected changes to the gsdl trunk since r14217 into the 2.74 branch

File:

• gsdl/branches/gsdl-2.74/src/recpt/librarymain.cpp (modified) (3 diffs)

gsdl/branches/gsdl-2.74/src/recpt/librarymain.cpp

@@ -178 +178 @@
   recpt.add_action (adocumentaction);
 
+  text_t userdbfile = filename_cat(gsdlhome, "etc", "users.db");
+  userdbclass *udb = new userdbclass(userdbfile);
+
+  text_t keydbfile = filename_cat(gsdlhome, "etc", "key.db");
+  keydbclass *kdb = new keydbclass(keydbfile);
+
 #ifdef GSDL_USE_USERS_ACTION
-  recpt.add_action (new usersaction());
+  usersaction *ausersaction = new usersaction();
+  ausersaction->set_userdb(udb);
+  recpt.add_action (ausersaction);
 #endif
 
@@ -190 +198 @@
 #ifdef GSDL_USE_AUTHEN_ACTION
   authenaction *aauthenaction = new authenaction();
+  aauthenaction->set_userdb(udb);
+  aauthenaction->set_keydb(kdb);
   aauthenaction->set_receptionist(&recpt);
   recpt.add_action (aauthenaction);
@@ -272 +282 @@
   cgiwrapper (recpt, "");
   delete cservers;
+  delete udb;
+  delete kdb;
 
   // clean up the actions