From: Mark Eichin <eichin@mit.edu>
Date: Sat, 27 Jan 1996 06:03:26 +0000 (+0000)
Subject: 	* t_kdb.c: wrap db_dbm decls and berkely_dispatch in ifdefs
X-Git-Tag: krb5-1.0-beta6~552
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57668e104ea21c12a8575cdd242042ca88addb9a;p=krb5.git

	* 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
---

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 620fbbdaf..34e37e063 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 62000e14b..85bdf9cda 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 0b1413b3e..f6ede021b 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))