diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-01-08 05:28:22 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-08 05:28:22 +0000 |
commit | 9d8525f2a152bb949053b52e91ccae0562a0cbb8 (patch) | |
tree | 73a3efedead7b4dedef99e1e718ac070d425637a /nss/nss_db/nss_db.h | |
parent | f14854aab2b23d37c27c21975c5cb9f493f4ae82 (diff) | |
download | glibc-9d8525f2a152bb949053b52e91ccae0562a0cbb8.tar glibc-9d8525f2a152bb949053b52e91ccae0562a0cbb8.tar.gz glibc-9d8525f2a152bb949053b52e91ccae0562a0cbb8.tar.bz2 glibc-9d8525f2a152bb949053b52e91ccae0562a0cbb8.zip |
Update.
2000-01-07 Andreas Jaeger <aj@suse.de>
Add support for Berkeley db 3.0.x and merge db support:
* nss/nss_db/dummy-db.h (struct db30): New.
(struct dbc30): New.
Added DB30* flags.
* nss/makedb.c: Move all database routines to db-open.c.
(main): Adjust to interface changes.
Load database early to initialize version dependend variables.
* nss/db-open.c: Merge database routines from makedb.c.
Define version dependend constansts as variables.
(load_db): Check also for db 3.
(internal_setent): Call dbopen.
(db_cursor): New function from makedb; handles db 3 now.
(dbopen): New function from makedb; handles db 3.
* nss/nss_db/db-XXX.c: Use db_notfound since the value is
different in different DB versions.
* nss/nss_db/nss_db.h: Add version dependend constants as
variables, add exportet interfaces from db-open.c.
* nss/Makefile ($(objpfx)makedb): Link against db-open.
2000-01-07 Ulrich Drepper <drepper@cygnus.com>
* misc/error.c: Don't use `defined _LIBC', only `_LIBC'.
Reported by Jim Meyering.
* time/strftime.c: Pretty printing.
2000-01-07 Andreas Jaeger <aj@suse.de>
* manual/socket.texi (Host Names): Fix example.
Reported by Marco Budde <budde@telos.de>.
Diffstat (limited to 'nss/nss_db/nss_db.h')
-rw-r--r-- | nss/nss_db/nss_db.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/nss/nss_db/nss_db.h b/nss/nss_db/nss_db.h index dbf6ed8b54..8abec2d8de 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 */ |