Remove eDirectory support code in LDAP KDB module

krb5 · Jul 29, 2012 · 95e9155 · 95e9155
1 parent 9c2e435
commit 95e9155
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 5,157 deletions.
diff --git a/doc/rst_source/krb_admins/admin_commands/kdb5_ldap_util.rst b/doc/rst_source/krb_admins/admin_commands/kdb5_ldap_util.rst
@@ -61,8 +61,6 @@ create
     [**-m|-P** *password*\|\ **-sf** *stashfilename*]
     [**-s**]
     [**-r** *realm*]
-    [**-kdcdn** *kdc_service_list*]
-    [**-admindn** *admin_service_list*]
     [**-maxtktlife** *max_ticket_life*]
     [**-maxrenewlife** *max_renewable_ticket_life*]
     [*ticket_flags*]
@@ -149,8 +147,6 @@ modify
     [**-sscope** *search_scope*]
     [**-containerref** *container_reference_dn*]
     [**-r** *realm*]
-    [**-kdcdn** *kdc_service_list* | [**-clearkdcdn** *kdc_service_list*] [**-addkdcdn** *kdc_service_list*]]
-    [**-admindn** *admin_service_list* | [**-clearadmindn** *admin_service_list*] [**-addadmindn** *admin_service_list*]]
     [**-maxtktlife** *max_ticket_life*]
     [**-maxrenewlife** *max_renewable_ticket_life*]
     [*ticket_flags*]

diff --git a/doc/rst_source/krb_build/options2configure.rst b/doc/rst_source/krb_build/options2configure.rst
@@ -317,9 +317,6 @@ Optional packages
 **--with-ldap**
     Compile OpenLDAP database backend module.
 
-**--with-edirectory**
-    Compile the eDirectory database backend module.
-
 **--with-tcl=**\ *path*
     Specifies that *path* is the location of a Tcl installation.
     Tcl is needed for some of the tests run by 'make check'; such tests

diff --git a/src/aclocal.m4 b/src/aclocal.m4
@@ -1641,29 +1641,15 @@ AC_ARG_WITH([ldap],
 [case "$withval" in
     OPENLDAP) with_ldap=yes ;;
     yes | no) ;;
-    EDIRECTORY) AC_MSG_ERROR(Option --with-ldap=EDIRECTORY is deprecated; use --with-edirectory instead.) ;;
     *)  AC_MSG_ERROR(Invalid option value --with-ldap="$withval") ;;
 esac], with_ldap=no)dnl
-AC_ARG_WITH([edirectory],
-[  --with-edirectory       compile eDirectory database backend module],
-[case "$withval" in
-    yes | no) ;;
-    *)  AC_MSG_ERROR(Invalid option value --with-edirectory="$withval") ;;
-esac], with_edirectory=no)dnl
 
 if test $with_ldap = yes; then
   if test $with_edirectory = yes; then
     AC_MSG_ERROR(Cannot enable both OpenLDAP and eDirectory backends; choose one.)
   fi
   AC_MSG_NOTICE(enabling OpenLDAP database backend module support)
   OPENLDAP_PLUGIN=yes
-elif test $with_edirectory = yes; then
-  AC_MSG_NOTICE(enabling eDirectory database backend module support)
-  OPENLDAP_PLUGIN=yes
-  AC_DEFINE(HAVE_EDIRECTORY,1,[Define if LDAP KDB interface should assume eDirectory.])
-else
-  : # neither enabled
-dnl  AC_MSG_NOTICE(disabling ldap backend module support)
 fi
 ])dnl
 dnl