aboutsummaryrefslogtreecommitdiff
path: root/nss/nss_db
diff options
context:
space:
mode:
Diffstat (limited to 'nss/nss_db')
-rw-r--r--nss/nss_db/db-XXX.c2
-rw-r--r--nss/nss_db/db-open.c308
-rw-r--r--nss/nss_db/dummy-db.h140
-rw-r--r--nss/nss_db/nss_db.h19
4 files changed, 394 insertions, 75 deletions
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 9115000..0b55cd2 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -122,7 +122,7 @@ lookup (DBT *key, struct STRUCTURE *result,
err = DL_CALL_FCT (db->get, (db->db, NULL, key, &value, 0));
if (err != 0)
{
- if (err == DB_NOTFOUND)
+ if (err == db_notfound)
{
H_ERRNO_SET (HOST_NOT_FOUND);
status = NSS_STATUS_NOTFOUND;
diff --git a/nss/nss_db/db-open.c b/nss/nss_db/db-open.c
index 75d39ef..470af04 100644
--- a/nss/nss_db/db-open.c
+++ b/nss/nss_db/db-open.c
@@ -1,5 +1,5 @@
-/* Common database open/close routines for nss_db.
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Common database routines for nss_db.
+ Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,10 +17,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <errno.h>
#include <fcntl.h>
#include <dlfcn.h>
#include <errno.h>
#include <stdlib.h>
+#include <libintl.h>
#include <bits/libc-lock.h>
#include "dummy-db.h"
@@ -41,30 +43,54 @@ static void *libdb_handle;
enum {
nodb,
db24,
- db27
+ db27,
+ db30
} libdb_version;
static int (*libdb_db_open) (const char *, int,
uint32_t, int, void *, void *, void **);
+static int (*libdb_db_create) (void *, void *, uint32_t);
+
+/* Constants which vary from version to version are actually variables
+ here. */
+int db_first;
+int db_next;
+int db_nooverwrite;
+int db_truncate;
+int db_rdonly;
+/* Variables which keep track of the error values. */
+int db_keyexist;
+int db_notfound;
+
/* Locks the static variables in this file. */
__libc_lock_define_initialized (static, lock)
/* Dynamically load the database library.
- We try libdb2.so.3, maybe others in the future. */
-static int
+ We try currently:
+ - libdb.so.3: the name used by glibc 2.1
+ - libdb-3.0.so: the name used by db-3.0.x
+ and maybe others in the future. */
+
+int
load_db (void)
{
- static const char *libnames[] = { "libdb.so.3" };
+ static const char *libnames[] = { "libdb.so.3", "libdb-3.0.so" };
int x;
- for(x = 0; x < sizeof (libnames) / sizeof (libnames[0]); ++x)
+ for (x = 0; x < sizeof (libnames) / sizeof (libnames[0]); ++x)
{
libdb_handle = dlopen (libnames[x], RTLD_LAZY);
if (libdb_handle == NULL)
continue;
- libdb_db_open = dlsym (libdb_handle, "db_open");
- if (libdb_db_open != NULL)
+ /* db 3.0 has db_create instead of db_open. */
+ libdb_db_create = dlsym (libdb_handle, "db_create");
+
+ if (libdb_db_create == NULL)
+ /* db 2.x uses db_open. */
+ libdb_db_open = dlsym (libdb_handle, "db_open");
+
+ if (libdb_db_open != NULL || libdb_db_create != NULL)
{
/* Alright, we got a library. Now find out which version it is. */
const char *(*db_version) (int *, int *, int *);
@@ -76,19 +102,55 @@ load_db (void)
int major, minor, subminor;
DL_CALL_FCT (db_version, (&major, &minor, &subminor));
- if (major == 2)
+ switch (major)
{
- /* We currently cannot handle other versions than the
- 2.x series. */
- if (minor < 6 || (minor == 6 && subminor < 4))
- libdb_version = db24;
- else
- libdb_version = db27;
+ case 2:
+ /* Sanity check: Do we have db_open? */
+ if (libdb_db_open != NULL)
+ {
+ if (minor < 6 || (minor == 6 && subminor < 4))
+ {
+ libdb_version = db24;
+ db_first = DB24_FIRST;
+ db_next = DB24_NEXT;
+ db_nooverwrite = DB24_NOOVERWRITE;
+ db_truncate = DB24_TRUNCATE;
+ }
+ else
+ {
+ libdb_version = db27;
+ db_first = DB27_FIRST;
+ db_next = DB27_NEXT;
+ db_nooverwrite = DB27_NOOVERWRITE;
+ db_truncate = DB27_TRUNCATE;
+ }
+ db_keyexist = DB2x_KEYEXIST;
+ db_notfound = DB2x_NOTFOUND;
+ db_rdonly = DB2x_RDONLY;
+ }
+ break;
+ case 3:
+ /* Sanity check: Do we have db_create? */
+ if (libdb_db_create != NULL)
+ {
+ libdb_version = db30;
+ db_first = DB30_FIRST;
+ db_next = DB30_NEXT;
+ db_keyexist = DB30_KEYEXIST;
+ db_notfound = DB30_NOTFOUND;
+ db_rdonly = DB30_RDONLY;
+ }
+ break;
+ default:
+ break;
}
}
-
if (libdb_version != nodb)
return 0;
+
+ /* Clear variables. */
+ libdb_db_open = NULL;
+ libdb_db_create = NULL;
}
dlclose (libdb_handle);
@@ -98,7 +160,6 @@ load_db (void)
return 1;
}
-
/* Make sure we don't use the library anymore once we are shutting down. */
static void __attribute__ ((destructor))
unload_db (void)
@@ -106,83 +167,206 @@ unload_db (void)
if (libdb_handle != NULL)
{
libdb_db_open = NULL;
+ libdb_db_create = NULL;
libdb_version = nodb;
dlclose (libdb_handle);
}
}
-
enum nss_status
internal_setent (const char *file, NSS_DB **dbp)
{
enum nss_status status = NSS_STATUS_SUCCESS;
- int err;
- void *db;
- int fd;
- int result;
-
if (*dbp == NULL)
{
- if (libdb_db_open == NULL)
+ if (libdb_db_open == NULL && libdb_db_create == NULL)
{
__libc_lock_lock (lock);
- err = load_db ();
+ status = load_db ();
__libc_lock_unlock (lock);
- if (err != 0)
- return NSS_STATUS_UNAVAIL;
+ if (status != 0)
+ return status;
}
- /* Open the database. Fortunately this interface seems to be the
- same for all supported versions. */
- err = DL_CALL_FCT (libdb_db_open,
- (file, DB_BTREE, DB_RDONLY, 0, NULL, NULL, &db));
+ status = dbopen (file, db_rdonly, 0, dbp);
+ }
+
+ return status;
+}
+
+
+/* Close the database file. */
+void
+internal_endent (NSS_DB **dbp)
+{
+ NSS_DB *db = *dbp;
+ if (db != NULL)
+ {
+ DL_CALL_FCT (db->close, (db->db, 0));
+ *dbp = NULL;
+ }
+}
+
+int
+db_cursor (void *db, void *txn, NSS_DBC **dbcp)
+{
+ void *ptr;
+ NSS_DBC *dbc = NULL;
+ int ret;
+
+ switch (libdb_version)
+ {
+ case db24:
+ ret = ((struct db24 *) db)->cursor (db, txn, &ptr);
+ break;
+ case db27:
+ ret = ((struct db27 *) db)->cursor (db, txn, &ptr, 0);
+ break;
+ case db30:
+ ret = ((struct db30 *) db)->cursor (db, txn, &ptr, 0);
+ break;
+ default:
+ abort ();
+ }
+ if (ret == 0)
+ {
+ dbc = (NSS_DBC *) malloc (sizeof (NSS_DBC));
+ if (dbc == NULL)
+ return 1;
+ dbc->cursor = ptr;
+
+ switch (libdb_version)
+ {
+ case db24:
+ dbc->c_get =
+ (int (*) (void *, void *, void *, uint32_t))
+ ((struct dbc24 *) ptr)->c_get;
+ break;
+ case db27:
+ dbc->c_get =
+ (int (*) (void *, void *, void *, uint32_t))
+ ((struct dbc27 *) ptr)->c_get;
+ break;
+ case db30:
+ dbc->c_get =
+ (int (*) (void *, void *, void *, uint32_t))
+ ((struct dbc30 *) ptr)->c_get;
+ default:
+ abort ();
+ }
+ }
+
+ *dbcp = dbc;
+
+ return ret;
+}
+
+
+int
+dbopen (const char *fname, int oper, int mode, NSS_DB **dbp)
+{
+ int err;
+ int result;
+ int fd;
+ void *odb;
+ enum nss_status status = NSS_STATUS_SUCCESS;
+ NSS_DB *db;
+
+ /* Actually open the database. */
+ switch (libdb_version)
+ {
+ case db24:
+ case db27:
+ err = DL_CALL_FCT (libdb_db_open,
+ (fname, DB_BTREE, oper, mode, NULL, NULL, &odb));
+ if (err != 0)
+ {
+ __set_errno (err);
+ *dbp = NULL;
+ return err == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
+ }
+ break;
+ case db30:
+ err = DL_CALL_FCT (libdb_db_create, (&odb, NULL, 0));
if (err != 0)
{
__set_errno (err);
*dbp = NULL;
return err == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
}
+ err = ((struct db30 *) odb)->open (odb, fname, NULL, DB_BTREE,
+ oper, mode);
+ if (err != 0)
+ {
+ __set_errno (err);
+ /* Free all resources. */
+ ((struct db30 *) odb)->close (odb, 0);
+ *dbp = NULL;
+ return NSS_STATUS_UNAVAIL;
+ }
+ break;
+ default:
+ abort ();
+ }
- /* Construct the object we pass up. */
- *dbp = (NSS_DB *) malloc (sizeof (NSS_DB));
- if (*dbp == NULL)
- return NSS_STATUS_UNAVAIL;
-
- (*dbp)->db = db;
+ /* Construct the object we pass up. */
+ db = (NSS_DB *) malloc (sizeof (NSS_DB));
+ if (db != NULL)
+ {
+ db->db = odb;
/* The functions are at different positions for the different
versions. Sigh. */
switch (libdb_version)
{
case db24:
- (*dbp)->close =
- (int (*) (void *, uint32_t)) ((struct db24 *) db)->close;
- (*dbp)->fd =
- (int (*) (void *, int *)) ((struct db24 *) db)->fd;
- (*dbp)->get =
+ db->close =
+ (int (*) (void *, uint32_t)) ((struct db24 *) odb)->close;
+ db->fd =
+ (int (*) (void *, int *)) ((struct db24 *) odb)->fd;
+ db->get =
(int (*) (void *, void *, void *, void *, uint32_t))
- ((struct db24 *) db)->get;
+ ((struct db24 *) odb)->get;
+ db->put =
+ (int (*) (void *, void *, void *, void *, uint32_t))
+ ((struct db24 *) odb)->put;
break;
case db27:
- (*dbp)->close =
- (int (*) (void *, uint32_t)) ((struct db27 *) db)->close;
- (*dbp)->fd =
- (int (*) (void *, int *)) ((struct db27 *) db)->fd;
- (*dbp)->get =
+ db->close =
+ (int (*) (void *, uint32_t)) ((struct db27 *) odb)->close;
+ db->fd =
+ (int (*) (void *, int *)) ((struct db27 *) odb)->fd;
+ db->get =
+ (int (*) (void *, void *, void *, void *, uint32_t))
+ ((struct db27 *) odb)->get;
+ db->put =
+ (int (*) (void *, void *, void *, void *, uint32_t))
+ ((struct db27 *) odb)->put;
+ break;
+ case db30:
+ db->close =
+ (int (*) (void *, uint32_t)) ((struct db30 *) odb)->close;
+ db->fd =
+ (int (*) (void *, int *)) ((struct db30 *) odb)->fd;
+ db->get =
+ (int (*) (void *, void *, void *, void *, uint32_t))
+ ((struct db30 *) odb)->get;
+ db->put =
(int (*) (void *, void *, void *, void *, uint32_t))
- ((struct db27 *) db)->get;
+ ((struct db30 *) odb)->put;
break;
default:
abort ();
}
+ db->cursor = db_cursor;
/* We have to make sure the file is `closed on exec'. */
- err = DL_CALL_FCT ((*dbp)->fd, (db, &fd));
+ err = DL_CALL_FCT (db->fd, (odb, &fd));
if (err != 0)
{
__set_errno (err);
@@ -202,25 +386,13 @@ internal_setent (const char *file, NSS_DB **dbp)
{
/* Something went wrong. Close the stream and return a
failure. */
- DL_CALL_FCT ((*dbp)->close, (db, 0));
+ DL_CALL_FCT (db->close, (odb, 0));
+ free (db);
status = NSS_STATUS_UNAVAIL;
- free (*dbp);
- *dbp = NULL;
+ db = NULL;
}
}
-
+ *dbp = db;
+
return status;
}
-
-
-/* Close the database file. */
-void
-internal_endent (NSS_DB **dbp)
-{
- NSS_DB *db = *dbp;
- if (db != NULL)
- {
- DL_CALL_FCT (db->close, (db->db, 0));
- *dbp = NULL;
- }
-}
diff --git a/nss/nss_db/dummy-db.h b/nss/nss_db/dummy-db.h
index 6ac8b77..66b5416 100644
--- a/nss/nss_db/dummy-db.h
+++ b/nss/nss_db/dummy-db.h
@@ -11,14 +11,18 @@
Define only what we really need. */
#define DB_BTREE (1)
-/* Permission flags are also not changed. */
-#define DB_RDONLY 0x010000
+/* Permission flags. */
+#define DB2x_RDONLY 0x010000
/* Access methods. */
#define DB24_FIRST 0x000020
#define DB24_NEXT 0x000800
#define DB24_NOOVERWRITE 0x001000
+/* The error values that are needed. */
+#define DB2x_KEYEXIST ( -3)
+#define DB2x_NOTFOUND ( -7)
+
/* This is for the db-2.x version up to 2.x.y. We use the name `db24' since
this is the version which was shipped with glibc 2.1. */
@@ -173,3 +177,135 @@ struct dbc27
#define DB27_FIRST 7
#define DB27_NEXT 15
#define DB27_NOOVERWRITE 17
+
+/* Versions for 3.0, incompatible with version 2.x. */
+struct db30
+{
+ size_t pgsize;
+ void (*db_feedback) (void *, int, int);
+ void *(*db_malloc) (size_t);
+ void *(*db_realloc) (void *, size_t);
+ int (*dup_compare) (const DBT *, const DBT *);
+ void *dbenv;
+ enum { dummy30 } type;
+ void *mpf;
+ void *mutexp;
+ u_int8_t fileid[20];
+ int32_t log_fileid;
+ void *open_txn;
+ void *saved_open_fhp;
+ struct
+ {
+ void *tqh_first;
+ void **tqh_last;
+ } free_queue;
+ struct
+ {
+ void *tqh_first;
+ void **tqh_last;
+ } active_queue;
+ void *bt_internal;
+ void *cj_internal;
+ void *h_internal;
+ void *q_internal;
+ void *xa_internal;
+ /* Functions. */
+ int (*close) (void *, uint32_t);
+ int (*cursor) (void *, void *, void **, uint32_t);
+ int (*del) (void *, void *, DBT *, uint32_t);
+ void (*err) (void *, int, const char *, ...);
+ void (*errx) (void *, const char *, ...);
+ int (*fd) (void *, int *);
+ int (*get) (void *, void *, DBT *, DBT *, uint32_t);
+ int (*get_byteswapped) (void *);
+ int (*get_type) (void *);
+ int (*join) (void *, void **, void **, uint32_t);
+ int (*open) (void *, const char *, const char *, int, uint32_t, int);
+ int (*put) (void *, void *, DBT *, DBT *, uint32_t);
+ int (*remove) (void *, const char *, const char *, uint32_t);
+ int (*set_cachesize) (void *, uint32_t, uint32_t, int);
+ int (*set_dup_compare) (void *, int (*)(const DBT *, const DBT *));
+ void (*set_errcall) (void *, void (*)(const char *, char *));
+ void (*set_errfile) (void *, void *);
+ void (*set_errpfx) (void *, const char *);
+ void (*set_feedback) (void *, void (*)(void *, int, int));
+ int (*set_flags) (void *, uint32_t);
+ int (*set_lorder) (void *, int);
+ int (*set_malloc) (void *, void *(*)(size_t));
+ int (*set_pagesize) (void *, uint32_t);
+ void (*set_paniccall) (void *, void (*)(void *, int));
+ int (*set_realloc) (void *, void *(*)(void *, size_t));
+ int (*stat) (void *, void *, void *(*)(size_t), uint32_t);
+ int (*sync) (void *, uint32_t);
+ int (*upgrade) (void *, const char *, uint32_t);
+
+ int (*set_bt_compare) (void *, int (*)(const DBT *, const DBT *));
+ int (*set_bt_maxkey) (void *, uint32_t);
+ int (*set_bt_minkey) (void *, uint32_t);
+ int (*set_bt_prefix) (void *, size_t (*)(const DBT *, const DBT *));
+
+ int (*set_h_ffactor) (void *, uint32_t);
+ int (*set_h_hash) (void *, uint32_t (*)(const void *, uint32_t));
+ int (*set_h_nelem) (void *, uint32_t);
+
+ int (*set_re_delim) (void *, int);
+ int (*set_re_len) (void *, uint32_t);
+ int (*set_re_pad) (void *, int);
+ int (*set_re_source) (void *, const char *);
+
+ uint32_t am_ok;
+ uint32_t flags;
+};
+
+
+struct dbc30
+{
+ void *dbp;
+ void *txn;
+ struct
+ {
+ void *tqe_next;
+ void **tqe_prev;
+ } links;
+ uint32_t lid; /* Default process' locker id. */
+ uint32_t locker; /* Locker for this operation. */
+ DBT lock_dbt; /* DBT referencing lock. */
+ struct
+ {
+ uint32_t pgno;
+ uint8_t fileid[20];
+ } lock;
+ struct
+ {
+ size_t off;
+ uint32_t ndx;
+ uint32_t gen;
+ } mylock;
+ DBT rkey;
+ DBT rdata;
+ int (*c_close) (void *);
+ int (*c_del) (void *, uint32_t);
+ int (*c_dup) (void *, void **, uint32_t);
+ int (*c_get) (void *, DBT *, DBT *, uint32_t);
+ int (*c_put) (void *, DBT *, DBT *, uint32_t);
+ int (*c_am_close) (void *);
+ int (*c_am_destroy) (void *);
+ void *internal;
+ uint32_t flags;
+};
+
+/* Flags which changed. */
+#define DB30_TRUNCATE 0x020000
+
+/* Access methods. */
+#define DB30_FIRST 9
+#define DB30_NEXT 17
+#define DB30_NOOVERWRITE 20
+
+/* Permission flags are changed. */
+#define DB30_RDONLY 0x000010
+
+
+/* The error values that are needed. */
+#define DB30_KEYEXIST (-30997)
+#define DB30_NOTFOUND (-30994)
diff --git a/nss/nss_db/nss_db.h b/nss/nss_db/nss_db.h
index dbf6ed8..8abec2d 100644
--- a/nss/nss_db/nss_db.h
+++ b/nss/nss_db/nss_db.h
@@ -22,10 +22,17 @@
#include <stdint.h>
-/* The error values kept the same values though new values were added.
- Define only those which we need. */
-#define DB_KEYEXIST ( -3)
-#define DB_NOTFOUND ( -7)
+/* Variables which keep track of the error values. */
+extern int db_keyexist;
+extern int db_notfound;
+
+/* Constants which vary from version to version are actually variables
+ here. */
+extern int db_first;
+extern int db_next;
+extern int db_nooverwrite;
+extern int db_truncate;
+extern int db_rdonly;
/* Flags are also unchanged. */
#define DB_CREATE 0x000001
@@ -69,5 +76,9 @@ typedef struct {
extern enum nss_status internal_setent (const char *file, NSS_DB **dbp);
extern void internal_endent (NSS_DB **dbp);
+extern int db_cursor (void *db, void *txn, NSS_DBC **dbcp);
+extern int load_db (void);
+extern int dbopen (const char *fname, int oper, int mode, NSS_DB **dbp);
+
#endif /* nss_db.h */
generated by cgit v1.1 at 2024-12-13 21:45:12 +0000