treat additional schemes as elective options as even {crypt} requires

special attention to implement on most platforms (due to OpenSSL issues).

diff --git a/configure b/configure
index aa3ee5d89778dd8d48d8fe72e1d61a06680882c0..c61f905c084d45acf55d7a681e0bc5fc71b4021d 100755 (executable)
--- a/configure
+++ b/configure
@@ -67,13 +67,13 @@ ac_help="$ac_help
 ac_help="$ac_help
     --enable-cleartext   enable cleartext passwords (yes)"
 ac_help="$ac_help
-    --enable-crypt       enable crypt(3) passwords (auto)"
+    --enable-crypt       enable crypt(3) passwords (no)"
 ac_help="$ac_help
     --enable-dynamic     enable linking built binaries with dynamic libs (no)"
 ac_help="$ac_help
     --enable-kpasswd     enable Kerberos password verification (no)"
 ac_help="$ac_help
-    --enable-lmpasswd    enable LAN Manager passwords (auto)"
+    --enable-lmpasswd    enable LAN Manager passwords (no)"
 ac_help="$ac_help
     --enable-spasswd     enable (Cyrus) SASL password verification (no)"
 ac_help="$ac_help
@@ -1612,7 +1612,7 @@ if test "${enable_crypt+set}" = set; then
        ol_enable_crypt="$ol_arg"
 
 else
-       ol_enable_crypt="auto"
+       ol_enable_crypt="no"
 fi
 # end --enable-crypt
 # OpenLDAP --enable-dynamic
@@ -1672,7 +1672,7 @@ if test "${enable_lmpasswd+set}" = set; then
        ol_enable_lmpasswd="$ol_arg"
 
 else
-       ol_enable_lmpasswd="auto"
+       ol_enable_lmpasswd="no"
 fi
 # end --enable-lmpasswd
 # OpenLDAP --enable-spasswd

diff --git a/configure.in b/configure.in
index f3e037e6d272f898024b1de99ca03be24c42f00c..758a402b22abe89148cf6995ed2979c09c5f6933 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -148,10 +148,10 @@ AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:])
 OL_ARG_ENABLE(slapd,[  --enable-slapd    enable building slapd], yes)dnl
 OL_ARG_ENABLE(aci,[    --enable-aci      enable per-object ACIs], no)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext          enable cleartext passwords], yes)dnl
-OL_ARG_ENABLE(crypt,[    --enable-crypt          enable crypt(3) passwords], auto)dnl
+OL_ARG_ENABLE(crypt,[    --enable-crypt          enable crypt(3) passwords], no)dnl
 OL_ARG_ENABLE(dynamic,[    --enable-dynamic      enable linking built binaries with dynamic libs], no)dnl
 OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd      enable Kerberos password verification], no)dnl
-OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd    enable LAN Manager passwords], auto)dnl
+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
 dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl