From 0de74408f2f33e252a71aa9dd39b71fb8b888dd1 Mon Sep 17 00:00:00 2001 From: Ryan Tandy Date: Fri, 28 Feb 2020 12:13:50 -0800 Subject: [PATCH] ITS#8639 Regenerate configure and portable.hin --- configure | 58 ++++++++------------------------------------ include/portable.hin | 3 --- 2 files changed, 10 insertions(+), 51 deletions(-) diff --git a/configure b/configure index 25c264acaf..5b5d3b04c6 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: a1f2cd419d8a3be4c692600bef1a69a03d860268 . +# From configure.in Id: c4f9dbe3dd538f85d7a57f40fe1d492df83dfb4a . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -994,7 +994,6 @@ enable_dynacl enable_aci enable_cleartext enable_crypt -enable_lmpasswd enable_spasswd enable_modules enable_rewrite @@ -1703,7 +1702,6 @@ SLAPD (Standalone LDAP Daemon) Options: --enable-aci enable per-object ACIs (experimental) no|yes|mod [no] --enable-cleartext enable cleartext passwords [yes] --enable-crypt enable crypt(3) passwords [no] - --enable-lmpasswd enable LAN Manager passwords [no] --enable-spasswd enable (Cyrus) SASL password verification [no] --enable-modules enable dynamic module support [no] --enable-rewrite enable DN rewriting in back-ldap and rwm overlay [auto] @@ -3926,27 +3924,6 @@ else fi # end --enable-crypt -# OpenLDAP --enable-lmpasswd - - # Check whether --enable-lmpasswd was given. -if test "${enable_lmpasswd+set}" = set; then : - enableval=$enable_lmpasswd; - ol_arg=invalid - for ol_val in auto yes no ; do - if test "$enableval" = "$ol_val" ; then - ol_arg="$ol_val" - fi - done - if test "$ol_arg" = "invalid" ; then - as_fn_error $? "bad value $enableval for --enable-lmpasswd" "$LINENO" 5 - fi - ol_enable_lmpasswd="$ol_arg" - -else - ol_enable_lmpasswd=no -fi - -# end --enable-lmpasswd # OpenLDAP --enable-spasswd # Check whether --enable-spasswd was given. @@ -5119,12 +5096,6 @@ if test $ol_enable_asyncmeta/$ol_enable_ldap = yes/no ; then as_fn_error $? "--enable-asyncmeta requires --enable-ldap" "$LINENO" 5 fi -if test $ol_enable_lmpasswd = yes ; then - if test $ol_with_tls = no ; then - as_fn_error $? "LAN Manager passwords require OpenSSL" "$LINENO" 5 - fi -fi - if test $ol_enable_spasswd = yes ; then if test $ol_with_cyrus_sasl = no ; then as_fn_error $? "options require --with-cyrus-sasl" "$LINENO" 5 @@ -6985,7 +6956,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6988 "configure"' > conftest.$ac_ext + echo '#line 6959 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8665,11 +8636,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8639: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8672: \$? = $ac_status" >&5 + echo "$as_me:8643: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8927,11 +8898,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8930: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8901: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8934: \$? = $ac_status" >&5 + echo "$as_me:8905: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8989,11 +8960,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8992: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8963: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8996: \$? = $ac_status" >&5 + echo "$as_me:8967: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10861,7 +10832,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&2;} fi -if test $ol_enable_lmpasswd != no; then - if test $ol_link_tls != yes ; then - as_fn_error $? "LAN Manager passwords require OpenSSL" "$LINENO" 5 - fi - - -$as_echo "#define SLAPD_LMHASH 1" >>confdefs.h - -fi ol_link_threads=no diff --git a/include/portable.hin b/include/portable.hin index 8618a2f890..f8185f09ba 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -930,9 +930,6 @@ /* define to support LDAP backend */ #undef SLAPD_LDAP -/* define to support LAN Manager passwords */ -#undef SLAPD_LMHASH - /* define to support MDB backend */ #undef SLAPD_MDB