From 21e48fad1806a05a3bdef95b454d6664edca028e Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 22 Apr 2020 16:11:33 +0000
Subject: [PATCH] ITS#6740 - regenerate configure

---
 configure            | 44 +-------------------------------------------
 include/portable.hin |  3 ---
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/configure b/configure
index 7e14c7e2c6..cc8e629b6c 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: b85f972b77efb3bf156dc7f6ae43465345b63a02 .
+# From configure.in Id: 92eed6ee362cb73d2675172c868d5152c1b05965 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -713,7 +713,6 @@ BUILD_SLAPI
 BUILD_SLAPD
 BUILD_LIBS_DYNAMIC
 BUILD_THREAD
-BUILD_REWRITE
 WITH_ACI_ENABLED
 WITH_MODULES_ENABLED
 WITH_TLS
@@ -844,7 +843,6 @@ enable_cleartext
 enable_crypt
 enable_spasswd
 enable_modules
-enable_rewrite
 enable_rlookups
 enable_slapi
 enable_slp
@@ -1547,7 +1545,6 @@ SLAPD (Standalone LDAP Daemon) Options:
     --enable-crypt	  enable crypt(3) 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]
     --enable-rlookups	  enable reverse lookups of client hostnames [no]
     --enable-slapi        enable SLAPI support (experimental) [no]
     --enable-slp          enable SLPv2 support [no]
@@ -3369,27 +3366,6 @@ else
 fi
 
 # end --enable-modules
-# OpenLDAP --enable-rewrite
-
-	# Check whether --enable-rewrite was given.
-if test "${enable_rewrite+set}" = set; then :
-  enableval=$enable_rewrite;
-	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-rewrite" "$LINENO" 5
-	fi
-	ol_enable_rewrite="$ol_arg"
-
-else
-  	ol_enable_rewrite=auto
-fi
-
-# end --enable-rewrite
 # OpenLDAP --enable-rlookups
 
 	# Check whether --enable-rlookups was given.
@@ -4448,10 +4424,6 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&
 	if test $ol_enable_aci != no ; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-aci argument" >&5
 $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-aci argument" >&2;}
-	fi
-	if test $ol_enable_rewrite = yes ; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-rewrite argument" >&5
-$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-rewrite argument" >&2;}
 	fi
 		case "$ol_enable_overlays" in yes | mod)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-overlays argument" >&5
@@ -4477,8 +4449,6 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
 	ol_enable_aci=no
 	ol_enable_wrappers=no
 
-	ol_enable_rewrite=no
-
 elif test $ol_enable_modules != yes &&
 	test $ol_enable_dnssrv = no &&
 	test $ol_enable_ldap = no &&
@@ -4535,7 +4505,6 @@ SLAPD_LIBS=
 
 BUILD_SLAPD=no
 
-BUILD_REWRITE=no
 BUILD_THREAD=no
 
 BUILD_SLAPI=no
@@ -24662,7 +24631,6 @@ fi
 if test "$ol_enable_meta" != no ; then
 	BUILD_SLAPD=yes
 	BUILD_META=$ol_enable_meta
-	BUILD_REWRITE=yes
 	if test "$ol_enable_meta" = mod ; then
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"
 		MFLAG=SLAPD_MOD_DYNAMIC
@@ -24680,7 +24648,6 @@ fi
 if test "$ol_enable_asyncmeta" != no ; then
 	BUILD_SLAPD=yes
 	BUILD_ASYNCMETA=$ol_enable_asyncmeta
-	BUILD_REWRITE=yes
 	if test "$ol_enable_asyncmeta" = mod ; then
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-asyncmeta"
 		MFLAG=SLAPD_MOD_DYNAMIC
@@ -25081,7 +25048,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_rwm" != no ; then
-	BUILD_REWRITE=yes
 	BUILD_RWM=$ol_enable_rwm
 	if test "$ol_enable_rwm" = mod ; then
 		MFLAG=SLAPD_MOD_DYNAMIC
@@ -25193,13 +25159,6 @@ _ACEOF
 
 fi
 
-if test "$ol_enable_rewrite" != no ; then
-
-$as_echo "#define ENABLE_REWRITE 1" >>confdefs.h
-
-	BUILD_REWRITE=yes
-fi
-
 if test "$ol_enable_slapi" != no ; then
 
 $as_echo "#define ENABLE_SLAPI 1" >>confdefs.h
@@ -25309,7 +25268,6 @@ fi
 
 
 
-
 
 
 # Check whether --with-xxinstall was given.
diff --git a/include/portable.hin b/include/portable.hin
index 4705205a8a..e1cad3666e 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -66,9 +66,6 @@
 /* define if sys_errlist is not declared in stdio.h or errno.h */
 #undef DECL_SYS_ERRLIST
 
-/* define to enable rewriting in back-ldap and back-meta */
-#undef ENABLE_REWRITE
-
 /* define to enable slapi library */
 #undef ENABLE_SLAPI