X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;fp=configure.in;h=aa3e46f665666fc6646dd953dbbfabf134a4103e;hb=52493faf2dfff3d680ec00024cc47b122a0f314e;hp=8a73414866f527622f0bd9a668ff05c9fe92f9ed;hpb=32449de89d9b4202c341220649710ee7418ab02e;p=openldap

diff --git a/configure.in b/configure.in
index 8a73414866..aa3e46f665 100644
--- a/configure.in
+++ b/configure.in
@@ -183,8 +183,6 @@ OL_ARG_ENABLE(slapd,[  --enable-slapd	  enable building slapd], yes)dnl
 OL_ARG_ENABLE(aci,[    --enable-aci	  enable per-object ACIs (experimental)], no)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext	  enable cleartext passwords], yes)dnl
 OL_ARG_ENABLE(crypt,[    --enable-crypt	  enable crypt(3) passwords], no)dnl
-dnl OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd	  enable Kerberos password verification], no)dnl
-ol_enable_kpasswd=${ol_enable_kpasswd-no}
 OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd	  enable LAN Manager passwords], no)dnl
 OL_ARG_ENABLE(spasswd,[    --enable-spasswd	  enable (Cyrus) SASL password verification], no)dnl
 OL_ARG_ENABLE(modules,[    --enable-modules	  enable dynamic module support], no)dnl
@@ -507,14 +505,14 @@ if test $ol_enable_lmpasswd = yes ; then
 	fi
 fi
 
-if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then
+if test $ol_enable_kbind = yes ; then
 	if test $ol_with_kerberos = no ; then
 		AC_MSG_ERROR([options require --with-kerberos])
 	elif test $ol_with_kerberos = auto ; then
 		ol_with_kerberos=yes
 	fi
 
-elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
+elif test $ol_enable_kbind = no ; then
 	if test $ol_with_kerberos = auto ; then
 		ol_with_kerberos=no
 	elif test $ol_with_kerberos != no ; then
@@ -1106,7 +1104,6 @@ fi
 dnl ----------------------------------------------------------------
 dnl Kerberos
 ol_link_kbind=no
-ol_link_kpasswd=no
 ol_link_krb5=no
 ol_link_krb4=no
 
@@ -1161,10 +1158,6 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
 			AC_DEFINE(HAVE_KRB5, 1,
 				[define if you have Kerberos V])
 
-			if test $ol_enable_kpasswd != no ; then
-				ol_link_kpasswd=yes;
-			fi
-
 			if test $ol_with_kerberos = k5only ; then
 				ol_with_kerberos=found
 			fi
@@ -1261,10 +1254,6 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
 	fi
 fi
 
-if test $ol_link_krb4 = yes -a $ol_enable_kpasswd != no ; then
-	ol_link_kpasswd=yes
-fi
-
 if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then
 	ol_link_kbind=yes
 
@@ -2525,9 +2514,6 @@ fi
 if test "$ol_enable_crypt" != no ; then
 	AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
 fi
-if test "$ol_link_kpasswd" != no ; then
-	AC_DEFINE(SLAPD_KPASSWD,1,[define to support Kerberos passwords])
-fi
 if test "$ol_link_spasswd" != no ; then
 	AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
 fi
@@ -2914,7 +2900,6 @@ servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:
 servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
 servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk  \
 servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk \
-servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/run \