Changeset 516 for trunk/gsdl/src/recpt/userdb.cpp

Timestamp:

1999-09-02T12:30:56+12:00 (25 years ago)

Author:

rjmcnab

Message:

added option for specifying whether the gdbm database should be locked

File:

• trunk/gsdl/src/recpt/userdb.cpp (modified) (8 diffs)

trunk/gsdl/src/recpt/userdb.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/09/02 00:30:04  rjmcnab
+   added option for specifying whether the gdbm database should be locked
+
    Revision 1.2  1999/07/14 08:30:01  rjmcnab
    fixed an error to do with the way time is dealt with on different machines.
@@ -26 +29 @@
 #include "gsdltimes.h"
 #include "fileutil.h"
+#include <stdlib.h>
 
 // include crypt
-//#include <crypt.h>
-#include <unistd.h>
+#include <crypt.h>
+//#include <unistd.h>
 
 
@@ -143 +147 @@
             userinfo_t &userinfo) {
   gdbmclass userdb;
-  if (!userdb.opendatabase(userdbfile)) {
-    if (!userdbfile.empty() && !file_exists (userdbfile) &&
-    username == "admin") {
+  if (!userdb.opendatabase(userdbfile, GDBM_READER, 1000, true)) {
+/*    if (!userdbfile.empty() && !file_exists (userdbfile) &&
+    username == "admin") {*/
+    if (!userdbfile.empty() && username == "admin") {
       // no database -- create a database with an initial account
       userinfo.clear();
@@ -180 +185 @@
             const userinfo_t &userinfo) {
   gdbmclass userdb;
-  if (!userdb.opendatabase(userdbfile, GDBM_WRCREAT, 1000)) return false;
+  if (!userdb.opendatabase(userdbfile, GDBM_WRCREAT, 1000, true)) return false;
 
   bool success = set_user_info (userdb, username, userinfo);
@@ -195 +200 @@
 void delete_user (const text_t &userdbfile, const text_t &username) {
   gdbmclass userdb;
-  if (!userdb.opendatabase(userdbfile, GDBM_WRCREAT, 1000)) return;
+  if (!userdb.opendatabase(userdbfile, GDBM_WRCREAT, 1000, true)) return;
 
   delete_user (userdb, username);
@@ -263 +268 @@
 text_t generate_key (const text_t &keydbfile, const text_t &username) {
   gdbmclass keydb;
-  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000)) return "";
+  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000, true)) return "";
 
   text_t key = generate_key (keydb, username);
@@ -306 +311 @@
         const text_t &key, const text_t &group, int keydecay) {
   gdbmclass keydb;
-  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000)) return "";
+  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000, true)) return false;
 
   bool success = check_key (keydb, thisuser, key, group, keydecay);
@@ -320 +325 @@
   // open the key database
   gdbmclass keydb;
-  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000)) return;
+  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000, true)) return;
 
   // get a list of keys created more than keydecay seconds agon