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

diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index 45d5773ca5c0682be1558cdea6fa4db6a570a816..e31200cd4df0e134868b0be0380d2f0ce751d6dd 100644 (file)
--- 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 f5524a2687078e01e01d78bd0830c0dd3ee631da..4ac47284b568217d0e78dda7e668a82b6acc5fa1 100644 (file)
--- 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 64357597d9d9b14896c282730656041b4059392c..e7dc6e242139b9efd20cb3e5431eaf4283784166 100644 (file)
--- 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 898b67832ddfb08d5576fbcc37a18b24272dd45a..09c818303c4c8216ccb72f148e0c6f808d7fd295 100644 (file)
--- 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 26ef17e2945b322604d75c5aa18515bb3eb3db8f..5393e7a2b8e0d649aaf011bb83b619a747cc9428 100644 (file)
--- 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 e709120f9350b83bd46592eee6c7ce346a4ed676..32aefe487ee4ec9185fd57a9599b658351498ed9 100644 (file)
--- 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 2fdca5600a86dbd00be0aa3678ba89b923f8bdfd..2f49bc28bdb61d6d74e28127a1db1652721a49f3 100644 (file)
--- 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 b66b8d18452c1c4e67175848de5c96e03a570ebd..0c6c8f2152b92816ff2f0a14a59d0c2a34f77c4c 100644 (file)
--- 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 9be1f7c82fc888018e6741dfd8f0a97ae911119e..b9b20cecdcf575f05ad1d9fb8dc4f42a10a602ff 100644 (file)
--- 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 6d66402090c552e19dd918a924f38ea9536bf5cb..7d4b63cd72d497fcc06d7377bc82ab7e8dfb11d3 100644 (file)
--- 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 d31e9110931dd5b67a02900d0a8d2184c7482e86..3b58bc3bc9b865640628a26a97da069581e34697 100644 (file)
--- 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 8b56f8cee8c6bc2208cacbf1c4693199f5e7c4a8..282dffb1deb4b8f73b29a4077dd0e5fe1905d30c 100644 (file)
--- 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 4e628dc28656cc5c0082b4266f22d4b5f7f1af5e..e8dab2ab4b6cd16726d16554c94fa1257ec468fb 100644 (file)
--- 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 3919a5702670ee71865803aeaa29d006775add9f..ad020ee055908048bc9458183e04b50676087262 100644 (file)
--- 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 9fcefb4abf80178f04ad1e2ddf7dd06f724ab61f..42c391c16cbcc47124dd1a8cc6a86aa221a1cc82 100644 (file)
--- 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 73f2af68bd9c0411f38cbaf3bd4635185ca3a2bd..d3bbc35f5f3af33744b7d6efd992c9aa7104dec8 100644 (file)
--- 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 6416f0e269a3806a3ef058f83d343140dee0b7c6..f770c79000913446c231970856b9cc5b5b260c8e 100644 (file)
--- 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 6b92b09aae13e45d9dbf939a35a20e2bb849b4a6..d39b4baabe057d97a5bdc9ea092ab60cc3d2a875 100644 (file)
--- 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 b6d320d629af8c9e17cae089003b28bf13821414..1dd1aea00ca116cda0ca98e059b3f2a4e651eaa1 100644 (file)
--- 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 3343055a36efa7a93c5ac50198210f6b4856ee21..12c9830be619e425666a294df20dfcc0fa9a9d81 100644 (file)
--- 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