Changeset 14270 for gsdl/branches/gsdl-2.74/src/recpt/usersaction.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/usersaction.cpp (modified) (3 diffs)

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

@@ -147 +147 @@
 
 void usersaction::configure (const text_t &key, const text_tarray &cfgline) {
-  // get the password filename
-  if (cfgline.size() == 1) {
-    if (key == "usersfile") usersfile = cfgline[0];
-  }
-
   action::configure (key, cfgline);
 }
@@ -161 +156 @@
     return false;
   }
-
-  if (usersfile.empty()) usersfile = filename_cat (gdbmhome, "etc", "users.db");
 
   return action::init (logout);
@@ -193 +186 @@
                  outconvertclass &outconvert, ostream &textout, 
                  ostream &logout) {
-
-  // open the user database (it will be used a lot)
-  user_database = new userdbclass(usersfile);
 
   if (args["uma"] == "adduser" || args["uma"] == "edituser") {