From 58b89e09205174d3cea7ee6305ea4953c05ad856 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 20 Apr 2020 21:42:11 +0000
Subject: [PATCH] ITS#9207 - regenerate

---
 configure            | 81 ++------------------------------------------
 include/portable.hin |  6 ----
 2 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/configure b/configure
index 48597d99e3..7e14c7e2c6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: 0dbcba198665a8209912067eb26f716de315f1c1 .
+# From configure.in Id: b85f972b77efb3bf156dc7f6ae43465345b63a02 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -1609,7 +1609,7 @@ Optional Packages:
   --with-cyrus-sasl	  with Cyrus SASL support [auto]
   --with-fetch		  with fetch(3) URL support [auto]
   --with-threads	  with threads [auto]
-  --with-tls		  with TLS/SSL support auto|openssl|gnutls|moznss [auto]
+  --with-tls		  with TLS/SSL support auto|openssl|gnutls [auto]
   --with-yielding-select  with implicitly yielding select [auto]
   --with-mp               with multiple precision statistics auto|longlong|long|bignum|gmp [auto]
   --with-odbc             with specific ODBC support iodbc|unixodbc|odbc32|auto [auto]
@@ -3137,7 +3137,7 @@ fi
 if test "${with_tls+set}" = set; then :
   withval=$with_tls;
 	ol_arg=invalid
-	for ol_val in auto openssl gnutls moznss yes no  ; do
+	for ol_val in auto openssl gnutls yes no  ; do
 		if test "$withval" = "$ol_val" ; then
 			ol_arg="$ol_val"
 		fi
@@ -17525,81 +17525,6 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 	fi
 fi
 
-if test $ol_link_tls = no ; then
-	if test $ol_with_tls = moznss || test $ol_with_tls = auto ; then
-		have_moznss=no
-		for ac_header in nssutil.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "nssutil.h" "ac_cv_header_nssutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_nssutil_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NSSUTIL_H 1
-_ACEOF
-
-fi
-
-done
-
-		if test "$ac_cv_header_nssutil_h" = yes ; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS_Initialize in -lnss3" >&5
-$as_echo_n "checking for NSS_Initialize in -lnss3... " >&6; }
-if ${ac_cv_lib_nss3_NSS_Initialize+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnss3  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char NSS_Initialize ();
-int
-main ()
-{
-return NSS_Initialize ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nss3_NSS_Initialize=yes
-else
-  ac_cv_lib_nss3_NSS_Initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_NSS_Initialize" >&5
-$as_echo "$ac_cv_lib_nss3_NSS_Initialize" >&6; }
-if test "x$ac_cv_lib_nss3_NSS_Initialize" = xyes; then :
-   have_moznss=yes
-else
-   have_moznss=no
-fi
-
-		fi
-
-		if test "$have_moznss" = yes ; then
-			ol_with_tls=moznss
-			ol_link_tls=yes
-
-$as_echo "#define HAVE_MOZNSS 1" >>confdefs.h
-
-			TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
-		else
-			if test $ol_with_tls = moznss ; then
-			as_fn_error $? "MozNSS not found - please specify the location to the NSPR and NSS header files in CPPFLAGS and the location to the NSPR and NSS libraries in LDFLAGS (if not in the system location)" "$LINENO" 5
-			fi
-		fi
-	fi
-fi
-
 WITH_TLS=no
 if test $ol_link_tls = yes ; then
 
diff --git a/include/portable.hin b/include/portable.hin
index 00a63959d5..4705205a8a 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -349,9 +349,6 @@
 /* define this if you have mkversion */
 #undef HAVE_MKVERSION
 
-/* define if you have MozNSS */
-#undef HAVE_MOZNSS
-
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
@@ -361,9 +358,6 @@
 /* define if strerror_r returns char* instead of int */
 #undef HAVE_NONPOSIX_STRERROR_R
 
-/* Define to 1 if you have the <nssutil.h> header file. */
-#undef HAVE_NSSUTIL_H
-
 /* if you have NT Event Log */
 #undef HAVE_NT_EVENT_LOG