oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

merge of DB-NEW

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10453 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-08-09 08:41:49 +00:00
parent 7e967c7282
commit 334c7ffa33
12 changed files with 169 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/hdb/db.c
View File

@@ -35,7 +35,13 @@
RCSID("$Id$");
#if defined(HAVE_DB_H) && DB_VERSION_MAJOR < 3
#if HAVE_DB1
#if defined(HAVE_DB_185_H)
#include <db_185.h>
#elif defined(HAVE_DB_H)
#include <db.h>
#endif
static krb5_error_code
DB_close(krb5_context context, HDB *db)
@@ -290,4 +296,4 @@ hdb_db_create(krb5_context context, HDB **db,
return 0;
}
#endif
#endif /* HAVE_DB1 */

7
lib/hdb/db3.c
View File

@@ -35,7 +35,10 @@
RCSID("$Id$");
#if defined(HAVE_DB_H) && DB_VERSION_MAJOR == 3
#if HAVE_DB3
#include <db.h>
static krb5_error_code
DB_close(krb5_context context, HDB *db)
{
@@ -322,4 +325,4 @@ hdb_db_create(krb5_context context, HDB **db,
(*db)->destroy = DB_destroy;
return 0;
}
#endif
#endif /* HAVE_DB3 */

8
lib/hdb/hdb.c
View File

@@ -41,18 +41,18 @@ struct hdb_method {
};
static struct hdb_method methods[] = {
#ifdef HAVE_DB_H
#if HAVE_DB1 || HAVE_DB3
{"db:", hdb_db_create},
#endif
#if defined(HAVE_NDBM_H) || defined(HAVE_GDBM_NDBM_H)
#if HAVE_NDBM
{"ndbm:", hdb_ndbm_create},
#endif
#ifdef OPENLDAP
{"ldap:", hdb_ldap_create},
#endif
#ifdef HAVE_DB_H
#if HAVE_DB1 || HAVE_DB3
{"", hdb_db_create},
#elif defined(HAVE_NDBM_H)
#elif defined(HAVE_NDBM)
{"", hdb_ndbm_create},
#elif defined(OPENLDAP)
{"", hdb_ldap_create},

12
lib/hdb/hdb_locl.h
View File

@@ -65,16 +65,4 @@
#include <hdb.h>
#include <hdb-private.h>
#if defined(HAVE_DB_185_H)
#include <db_185.h>
#elif defined(HAVE_DB_H)
#include <db.h>
#endif
#if defined(HAVE_NDBM_H)
#include <ndbm.h>
#elif defined(HAVE_GDBM_NDBM_H)
#include <gdbm/ndbm.h>
#endif
#endif /* __HDB_LOCL_H__ */

12
lib/hdb/ndbm.c
View File

@@ -35,7 +35,15 @@
RCSID("$Id$");
#if defined(HAVE_NDBM_H) || defined(HAVE_GDBM_NDBM_H)
#if HAVE_NDBM
#if defined(HAVE_GDBM_NDBM_H)
#include <gdbm/ndbm.h>
#elif defined(HAVE_DBM_H)
#include <dbm.h>
#elif defined(HAVE_NDBM_H)
#include <ndbm.h>
#endif
struct ndbm_db {
DBM *db;
@@ -350,4 +358,4 @@ hdb_ndbm_create(krb5_context context, HDB **db,
return 0;
}
#endif
#endif /* HAVE_NDBM */