Add ability to switch between Berkeley and DBM for KDC database

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6214 dc483132-0cff-0310-8789-dd5450dbe970

20 files changed, 200 insertions, 1 deletions

diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index 45d5773ca..e31200cd4 100644
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jun 30 14:30:07 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
+
 Thu Jun 15 15:29:39 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index f5524a268..4ac47284b 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -1,5 +1,19 @@
 AC_INIT(kdb5_create.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index 64357597d..e7dc6e242 100644
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jun 30 14:30:49 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
+
 Thu Jun 15 15:31:59 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index 898b67832..09c818303 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -1,5 +1,19 @@
 AC_INIT(kdb5_destroy.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index 26ef17e29..5393e7a2b 100644
--- a/src/admin/stash/ChangeLog
+++ b/src/admin/stash/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jun 30 14:31:23 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
+
 Thu Jun 15 15:35:39 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index e709120f9..32aefe487 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -1,5 +1,19 @@
 AC_INIT(kdb5_stash.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index 2fdca5600..2f49bc28b 100644
--- a/src/kadmin.old/client/ChangeLog
+++ b/src/kadmin.old/client/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jun 30 14:36:35 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
 Wed Jun 21 10:49:32 1995    <tytso@rsx-11.mit.edu>
 
 	* kadmin.c: Change PROTOTYPE -> KRB5_PROTOTYPE
diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in
index b66b8d184..0c6c8f215 100644
--- a/src/kadmin.old/client/configure.in
+++ b/src/kadmin.old/client/configure.in
@@ -3,5 +3,19 @@ CONFIG_RULES
 AC_CHECK_HEADERS(stdlib.h)
 AC_PROG_INSTALL
 ET_RULES
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/kpasswd/ChangeLog b/src/kadmin.old/kpasswd/ChangeLog
index 9be1f7c82..b9b20cecd 100644
--- a/src/kadmin.old/kpasswd/ChangeLog
+++ b/src/kadmin.old/kpasswd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jun 30 14:37:02 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and
+		DBM KDC database format.
+
 Wed Jun 21 10:50:33 1995    <tytso@rsx-11.mit.edu>
 
 	* kpasswd.c: Change PROTOTYPE -> KRB5_PROTOTYPE
diff --git a/src/kadmin.old/kpasswd/configure.in b/src/kadmin.old/kpasswd/configure.in
index 6d6640209..7d4b63cd7 100644
--- a/src/kadmin.old/kpasswd/configure.in
+++ b/src/kadmin.old/kpasswd/configure.in
@@ -5,5 +5,19 @@ AC_HAVE_HEADERS(unistd.h string.h stdlib.h)
 CHECK_UTMP
 AC_FUNC_CHECK(getutent,AC_DEFINE(HAVE_GETUTENT))
 ET_RULES
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index d31e91109..3b58bc3bc 100644
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jun 30 14:37:32 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
+
 Tue Jun 27 16:10:19 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* adm_parse.c - Give compiler something to compile if SANDIA is not
 		defined.  Some compilers choke when nothing to compile.
diff --git a/src/kadmin.old/server/configure.in b/src/kadmin.old/server/configure.in
index 8b56f8cee..282dffb1d 100644
--- a/src/kadmin.old/server/configure.in
+++ b/src/kadmin.old/server/configure.in
@@ -5,5 +5,19 @@ HAS_ANSI_VOLATILE
 AC_TIME_WITH_SYS_TIME
 ET_RULES
 CHECK_SIGPROCMASK
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in
index 4e628dc28..e8dab2ab4 100644
--- a/src/kadmin/v5client/configure.in
+++ b/src/kadmin/v5client/configure.in
@@ -2,9 +2,23 @@ AC_INIT(kadmin5.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_PROG_YACC
-AC_HAVE_HEADERS(pwd.h regex.h)
+AC_HAVE_HEADERS(pwd.h regex.h regexp.h)
 AC_HAVE_FUNCS(strptime re_comp regcomp getcwd)
 AC_CONST
 SS_RULES
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in
index 3919a5702..ad020ee05 100644
--- a/src/kadmin/v5server/configure.in
+++ b/src/kadmin/v5server/configure.in
@@ -8,5 +8,19 @@ CHECK_SIGNALS
 CHECK_SETJMP
 CHECK_WAIT_TYPE
 ET_RULES
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 9fcefb4ab..42c391c16 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jun 30 14:38:09 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
 Thu Jun 29 06:50:08 1995  Mark Eichin  <eichin@cygnus.com>
 
 	* kerberos_v4.c (check_princ): delete master_key_version check,
diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 73f2af68b..d3bbc35f5 100644
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -5,5 +5,19 @@ AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_HEADERS(sys/select.h)
 ET_RULES
 HAS_ANSI_VOLATILE
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 6416f0e26..f770c7900 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jun 30 14:38:56 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
 Wed Jun 28 20:14:35 1995  Mark Eichin  <eichin@cygnus.com>
 
 	* test.c: use PROTOTYPE.
diff --git a/src/krb524/configure.in b/src/krb524/configure.in
index 6b92b09aa..d39b4baab 100644
--- a/src/krb524/configure.in
+++ b/src/krb524/configure.in
@@ -6,5 +6,19 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_TYPE_SIGNAL
 ET_RULES
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index b6d320d62..1dd1aea00 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jun 30 14:47:04 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
+
 Thu Jun 15 18:09:33 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/slave/configure.in b/src/slave/configure.in
index 3343055a3..12c9830be 100644
--- a/src/slave/configure.in
+++ b/src/slave/configure.in
@@ -3,5 +3,19 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_LIB(util,main)
+AC_ARG_WITH([dbm],
+[  --with-dbm		use native dbm for kdc database
+  --without-dbm		use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Using native dbm)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE