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

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

@@ -33 +33 @@
 #include "infodbclass.h"
 #include "gsdltimes.h"
-#include "userdb.h"
 
 
@@ -129 +128 @@
 
 void authenaction::configure (const text_t &key, const text_tarray &cfgline) {
-  // get the password filename
-  if (cfgline.size() == 1) {
-    if (key == "usersfile") usersfile = cfgline[0];
-    else if (key == "keyfile") keyfile = cfgline[0];
-    else if (key == "keydecay") keydecay = cfgline[0].getint();
-  }
-
   action::configure (key, cfgline);
 }
 
 bool authenaction::init (ostream &logout) {
-
   if (gdbmhome.empty()) {
     logout << "ERROR (authenaction::init) gdbmhome is not set\n";
     return false;
   }
-
-  if (usersfile.empty()) usersfile = filename_cat (gdbmhome, "etc", "users.db");
-  if (keyfile.empty()) keyfile = filename_cat (gdbmhome, "etc", "key.db");
 
   return action::init (logout);
@@ -169 +157 @@
   if (args["uan"].empty()) return true;
 
-  userdbclass *user_database = new userdbclass(usersfile);
-  keydbclass *key_database = new keydbclass(keyfile);
-
   // failure means we have to redirect to this action to get authentication
   // (if we are not already doing this)
@@ -188 +173 @@
   else args_us = "failed";
 
-  // make sure we have a username
-  if (!args_un.empty() && (user_database->get_user_info (args_un, thisuser) == ERRNO_SUCCEED)) {
+  // make sure we have a username                                                                                                 
+  int status = user_database->get_user_info (args_un, thisuser);
+  if (!args_un.empty() && (status == ERRNO_SUCCEED)) {
     if (!args_pw.empty()) {
       // we are authenticating using a password
@@ -286 +272 @@
   }
 
-  //close the database
-  user_database->closedatabase();
-  key_database->closedatabase();
   return true;
 }