diff options
| author | Mark Eichin <eichin@mit.edu> | 1996-01-27 06:03:26 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1996-01-27 06:03:26 +0000 |
| commit | 57668e104ea21c12a8575cdd242042ca88addb9a (patch) | |
| tree | b84be0b5506ed5bfeeefbcb2dfb19b07dd3c1ca8 | |
| parent | e3cba12681e687787e18e261e8c07b4b5c1b2dd1 (diff) | |
| download | krb5-57668e104ea21c12a8575cdd242042ca88addb9a.tar.gz krb5-57668e104ea21c12a8575cdd242042ca88addb9a.tar.xz krb5-57668e104ea21c12a8575cdd242042ca88addb9a.zip | |
* t_kdb.c: wrap db_dbm decls and berkely_dispatch in ifdefs
BERK_DB_DBM.
(do_testing): wrap references as well.
* keytab.c (krb5_ktkdb_get_entry): use KRB5_PROTOTYPE.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7400 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/kdb/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/kdb/keytab.c | 4 | ||||
| -rw-r--r-- | src/lib/kdb/t_kdb.c | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 620fbbdafe..34e37e0630 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,11 @@ +Sat Jan 27 01:01:17 1996 Mark Eichin <eichin@cygnus.com> + + * t_kdb.c: wrap db_dbm decls and berkely_dispatch in ifdefs + BERK_DB_DBM. + (do_testing): wrap references as well. + + * keytab.c (krb5_ktkdb_get_entry): use KRB5_PROTOTYPE. + Wed Dec 13 09:28:33 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * keytab.c (krb5_ktkdb_resolve): Fix casting diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c index 62000e14be..85bdf9cda4 100644 --- a/src/lib/kdb/keytab.c +++ b/src/lib/kdb/keytab.c @@ -25,8 +25,8 @@ #include "k5-int.h" #include "kdb_dbc.h" -krb5_error_code krb5_ktkdb_get_entry(krb5_context, krb5_keytab, krb5_principal, - krb5_kvno, krb5_enctype, krb5_keytab_entry *); +krb5_error_code krb5_ktkdb_get_entry KRB5_PROTOTYPE((krb5_context, krb5_keytab, krb5_principal, + krb5_kvno, krb5_enctype, krb5_keytab_entry *)); krb5_kt_ops krb5_kt_kdb_ops = { 0, diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c index 0b1413b3e8..f6ede021b6 100644 --- a/src/lib/kdb/t_kdb.c +++ b/src/lib/kdb/t_kdb.c @@ -77,6 +77,7 @@ struct timezone dontcare; krb5_principal *recorded_principals = (krb5_principal *) NULL; char **recorded_names = (char **) NULL; +#ifdef BERK_DB_DBM extern DBM *db_dbm_open PROTOTYPE((char *, int, int)); extern void db_dbm_close PROTOTYPE((DBM *)); extern datum db_dbm_fetch PROTOTYPE((DBM *, datum)); @@ -105,6 +106,7 @@ static kdb5_dispatch_table berkeley_dispatch = { db_dbm_dirfno, /* Get Database FD num */ (int (*)()) NULL /* Get Database FD num */ }; +#endif /* * The following prototypes are necessary in case dbm_error and @@ -483,11 +485,13 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, krb5_init_ets(kcontext); switch (db_type) { +#ifdef BERK_DB_DBM case DB_BERKELEY: op = "setting up Berkeley database operations"; if (kret = kdb5_db_set_dbops(kcontext, &berkeley_dispatch)) goto goodbye; break; +#endif case DB_DBM: op = "setting up DBM database operations"; if (kret = kdb5_db_set_dbops(kcontext, &dbm_dispatch)) @@ -901,10 +905,12 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, krb5_init_context(&ccontext); krb5_init_ets(ccontext); switch (db_type) { +#ifdef BERK_DB_DBM case DB_BERKELEY: if (kret = kdb5_db_set_dbops(ccontext, &berkeley_dispatch)) exit(1); break; +#endif case DB_DBM: if (kret = kdb5_db_set_dbops(ccontext, &dbm_dispatch)) exit(1); @@ -997,11 +1003,13 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, if (db_created) { if (!kret && !save_db) { switch (db_type) { +#ifdef BERK_DB_DBM case DB_BERKELEY: op = "setting up Berkeley database operations"; if (kret = kdb5_db_set_dbops(kcontext, &berkeley_dispatch)) goto goodbye1; break; +#endif case DB_DBM: op = "setting up DBM database operations"; if (kret = kdb5_db_set_dbops(kcontext, &dbm_dispatch)) |