Enable argon2 only in Fedora

libsodium is not included in RHEL, nor is openldap-servers shipped.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -16,3 +16,29 @@
 /openldap-2.4.43.tgz
 /openldap-2.4.44.tgz
 /openldap-2.4.45.tgz
+/openldap-2.4.46.tgz
+/openldap-2.4.47.tgz
+/openldap-2.4.50.tgz
+/openldap-2.4.52.tgz
+/openldap-2.4.53.tgz
+/openldap-2.4.54.tgz
+/openldap-2.4.55.tgz
+/openldap-2.4.56.tgz
+/openldap-2.4.57.tgz
+/openldap-2.4.58.tgz
+/openldap-2.4.59.tgz
+/openldap-2.5.4.tgz
+/openldap-ppolicy-check-password-1.1.tar.gz
+/openldap-2.5.5.tgz
+/openldap-2.5.7.tgz
+/openldap-2.5.8.tgz
+/openldap-2.6.1.tgz
+/openldap-2.6.2.tgz
+/openldap-2.6.3.tgz
+/openldap-2.6.4.tgz
+/openldap-2.6.5.tgz
+/openldap-2.6.6.tgz
+/openldap-2.6.7.tgz
+/openldap-2.6.8.tgz
+/openldap-2.6.9.tgz
+/openldap-2.6.10.tgz

UPGRADE_INSTRUCTIONS

@@ -0,0 +1,30 @@
+You have upgraded your openldap-servers package.
+Any major version upgrade can cause database corruption or loss.
+Please, make sure that you have up-to-date back up and read this document carefully.
+
+It's still recommended to do the backup even on the minor version upgrade.
+
+Please, review the next links before performing any action:
+
+Upgrading from 2.4.x - https://www.openldap.org/doc/admin25/appendix-upgrading.html
+Upgrading from 2.5.x - https://www.openldap.org/doc/admin26/appendix-upgrading.html
+The normal upgrade procedure - https://www.openldap.org/doc/admin26/maintenance.html
+
+Additionally, please, review and perform the following steps that can help you with the upgrade:
+
+         1. Back up both data and configuration directories into a safe place;
+         2. Export data to an LDIF file using slapcat;
+a. If you have the deprecated DB type and you haven't performed the slapcat command, you need to move your data and configuration to the system with OpenLDAP 2.4 version and run slapcat command there;
+         3. Change the server's configuration according to the changes in the above documents;
+          a. If you are replacing the BDB/HDB with MDB, make sure to replace the BDB/HDB sections with their MDB counterparts;
+4. Clear out the current data directory;
+         5. Import data to a new database from the LDIF file using slapadd;
+         6. Make sure that your data is intact.
+
+After you have completed the above operations, you can remove this file (/usr/share/openldap-servers/UPGRADE_INSTRUCTIONS) and start the server:
+
+        systemctl start slapd.service
+
+Be careful with this document's procedure, make sure you understand it, and test it in a non-production environment first. Always make sure that all backups are in place.
+
+You have been warned about the possibility of data corruption or loss.

check-password-makefile.patch

@@ -1,32 +1,45 @@
---- a/Makefile	2009-10-31 18:59:06.000000000 +0100
-+++ b/Makefile	2014-12-17 09:42:37.586079225 +0100
-@@ -13,22 +13,11 @@
+diff --git a/Makefile b/Makefile
+index 4457bad..91de40b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,17 +13,10 @@ CRACKLIB=/usr/share/cracklib/pw_dict
  #
  CONFIG=/etc/openldap/check_password.conf
  
--OPT=-g -O2 -Wall -fpic 						\
--	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""	\
--	-DCONFIG_FILE="\"$(CONFIG)\""					\
-+CFLAGS+=-fpic                                                  \
-+	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""  \
-+	-DCONFIG_FILE="\"$(CONFIG)\""                          \
- 	-DDEBUG
- 
+-
 -# Where to find the OpenLDAP headers.
 -#
--LDAP_INC=-I/home/pyb/tmp/openldap-2.3.39/include \
--	 -I/home/pyb/tmp/openldap-2.3.39/servers/slapd
+-LDAP_INC=-I/usr/include/openldap/include \
+-	 -I/usr/include/openldap/servers/slapd
 -
 -# Where to find the CrackLib headers.
 -#
 -CRACK_INC=
 -
 -INCS=$(LDAP_INC) $(CRACK_INC)
--
++CFLAGS+=-fpic                                                  \
++	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""  \
++	-DCONFIG_FILE="\"$(CONFIG)\""                          \
++	-DDEBUG
+ 
  LDAP_LIB=-lldap_r -llber
  
- # Comment out this line if you do NOT want to use the cracklib.
-@@ -45,10 +34,10 @@
+@@ -33,27 +26,21 @@ LDAP_LIB=-lldap_r -llber
+ #
+ CRACKLIB_LIB=-lcrack
+ 
+-CC_FLAGS=-g -O2 -Wall -fpic
+-CRACKLIB_OPT=-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""
+-DEBUG_OPT=-DDEBUG
+-CONFIG_OPT=-DCONFIG_FILE="\"$(CONFIG)\""
+-
+-OPT=$(CC_FLAGS) $(CRACKLIB_OPT) $(CONFIG_OPT) $(DEBUG_OPT)
+-
+ LIBS=$(LDAP_LIB) $(CRACKLIB_LIB)
+ 
+ LIBDIR=/usr/lib/openldap/
+ 
++
  all: 	check_password
  
  check_password.o:
@@ -38,4 +51,8 @@
 +	$(CC) $(LDFLAGS) -shared -o check_password.so check_password.o $(CRACKLIB_LIB)
  
  install: check_password
- 	cp -f check_password.so ../../../usr/lib/openldap/modules/
+-	cp -f check_password.so $(LIBDIR)
++	cp -f check_password.so ../../../usr/lib/openldap/modules/
+ 
+ clean:
+ 	$(RM) check_password.o check_password.so check_password.lo

ldap.conf

@@ -12,7 +12,16 @@
 #TIMELIMIT	15
 #DEREF		never
 
-TLS_CACERTDIR	/etc/openldap/certs
+# When no CA certificates are specified the Shared System Certificates
+# are in use. In order to have these available along with the ones specified
+# by TLS_CACERTDIR one has to include them explicitly:
+#TLS_CACERT	/etc/pki/tls/cert.pem
+
+# System-wide Crypto Policies provide up to date cipher suite which should
+# be used unless one needs a finer grinded selection of ciphers. Hence, the
+# PROFILE=SYSTEM value represents the default behavior which is in place
+# when no explicit setting is used. (see openssl-ciphers(1) for more info)
+#TLS_CIPHER_SUITE PROFILE=SYSTEM
 
 # Turning this off breaks GSSAPI used with krb5 when rdns = false
 SASL_NOCANON	on

libexec-check-config.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /usr/bin/sh
 # Author: Jan Vcelak <jvcelak@redhat.com>
 
 . /usr/libexec/openldap/functions
@@ -41,7 +41,7 @@ function check_db_perms()
 	retcode=0
 	for dbdir in `databases`; do
 		[ -d "$dbdir" ] || continue
-		for dbfile in `find ${dbdir} -maxdepth 1 -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb" -or -name "__db.*" -or -name "log.*" -or -name "alock"`; do
+		for dbfile in `find ${dbdir} -maxdepth 1 -name "*.mdb"` ; do
 			run_as_ldap "/usr/bin/test -r \"$dbfile\" -a -w \"$dbfile\""
 			if [ $? -ne 0 ]; then
 				error "Read/write permissions for DB file '%s' are required." "$dbfile"
@@ -56,8 +56,7 @@ function check_everything()
 {
 	retcode=0
 	check_config_syntax || retcode=1
-	# TODO: need support for Mozilla NSS, disabling temporarily
-	#check_certs_perms || retcode=1
+	check_certs_perms || retcode=1
 	check_db_perms || retcode=1
 	return $retcode
 }

libexec-functions

@@ -84,14 +84,6 @@ function databases_new()
 		ldif_value
 }
 
-function databases_old()
-{
-	awk	'begin { database="" }
-		$1 == "database" { database=$2 }
-		$1 == "directory" { if (database == "bdb" || database == "hdb") print $2}' \
-		"$SLAPD_CONFIG_FILE"
-}
-
 function certificates_new()
 {
 	slapcat $SLAPD_GLOBAL_OPTIONS -c -H 'ldap:///cn=config???(cn=config)' 2>/dev/null | \
@@ -100,20 +92,14 @@ function certificates_new()
 		ldif_value
 }
 
-function certificates_old()
-{
-	awk '$1 ~ "^TLS(CACertificate(File|Path)|CertificateFile|CertificateKeyFile)$" { print $2 } ' \
-		"$SLAPD_CONFIG_FILE"
-}
-
 function certificates()
 {
-	uses_new_config && certificates_new || certificates_old
+	uses_new_config && certificates_new
 }
 
 function databases()
 {
-	uses_new_config && databases_new || databases_old
+	uses_new_config && databases_new
 }
 
 

libexec-upgrade-db.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-. /usr/libexec/openldap/functions
-
-if [ `id -u` -ne 0 ]; then
-	error "You have to be root to run this command."
-	exit 4
-fi
-
-load_sysconfig
-retcode=0
-
-for dbdir in `databases`; do
-	upgrade_log="$dbdir/db_upgrade.`date +%Y%m%d%H%M%S`.log"
-	bdb_files=`find "$dbdir" -maxdepth 1 -name "*.bdb" -printf '"%f" '`
-
-	# skip uninitialized database
-	[ -z "$bdb_files"]  || continue
-
-	printf "Updating '%s', logging into '%s'\n" "$dbdir" "$upgrade_log"
-
-	# perform the update
-	for command in \
-		"/usr/bin/db_recover -v -h \"$dbdir\"" \
-		"/usr/bin/db_upgrade -v -h \"$dbdir\" $bdb_files" \
-		"/usr/bin/db_checkpoint -v -h \"$dbdir\" -1" \
-	; do
-		printf "Executing: %s\n" "$command" &>>$upgrade_log
-		run_as_ldap "$command" &>>$upgrade_log
-		result=$?
-		printf "Exit code: %d\n" $result >>"$upgrade_log"
-		if [ $result -ne 0 ]; then
-			printf "Upgrade failed: %d\n" $result
-			retcode=1
-		fi
-	done
-done
-
-exit $retcode

openldap-ITS-10297-Defer-hostname-resolution-til-first-use.patch

@@ -0,0 +1,120 @@
+From 606349836109cfb201bc5b5b424dffb749150a68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@mistotebe.net>
+Date: Mon, 28 Apr 2025 14:36:24 +0100
+Subject: [PATCH] ITS#10297 Defer hostname resolution til first use
+
+---
+ libraries/libldap/init.c     | 33 +++++++++++++++++++--------------
+ libraries/libldap/ldap-int.h |  1 +
+ libraries/libldap/os-ip.c    |  2 ++
+ libraries/libldap/tls_g.c    |  3 +++
+ libraries/libldap/tls_o.c    |  3 +++
+ 6 files changed, 28 insertions(+), 14 deletions(-)
+
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index 213276b4b5..90fc34c5a6 100644
+--- a/libraries/libldap/init.c
++++ b/libraries/libldap/init.c
+@@ -631,6 +631,25 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
+ 
+ #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+ char * ldap_int_hostname = NULL;
++
++void
++ldap_int_resolve_hostname(void)
++{
++	static int resolved = 0;
++
++	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
++	if ( !resolved ) {
++		char	*name = ldap_int_hostname;
++
++		ldap_int_hostname = ldap_pvt_get_fqdn( name );
++
++		if ( name != NULL && name != ldap_int_hostname ) {
++			LDAP_FREE( name );
++		}
++		resolved = 1;
++	}
++	LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
++}
+ #endif
+ 
+ #ifdef LDAP_R_COMPILE
+@@ -688,20 +707,6 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
+ }
+ #endif
+ 
+-#if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+-	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
+-	{
+-		char	*name = ldap_int_hostname;
+-
+-		ldap_int_hostname = ldap_pvt_get_fqdn( name );
+-
+-		if ( name != NULL && name != ldap_int_hostname ) {
+-			LDAP_FREE( name );
+-		}
+-	}
+-	LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
+-#endif
+-
+ #ifndef HAVE_POLL
+ 	if ( ldap_int_tblsize == 0 ) ldap_int_ip_init();
+ #endif
+diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
+index 7e754775e8..435b859066 100644
+--- a/libraries/libldap/ldap-int.h
++++ b/libraries/libldap/ldap-int.h
+@@ -743,6 +743,7 @@ LDAP_F (int) ldap_int_poll( LDAP *ld, ber_socket_t s,
+ 
+ #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+ LDAP_V (char *) ldap_int_hostname;
++LDAP_F (void) ldap_int_resolve_hostname(void);
+ LDAP_F (char *) ldap_host_connected_to( Sockbuf *sb,
+ 	const char *host );
+ #endif
+diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
+index 6c86edd055..629b540352 100644
+--- a/libraries/libldap/os-ip.c
++++ b/libraries/libldap/os-ip.c
+@@ -890,6 +890,8 @@ ldap_host_connected_to( Sockbuf *sb, const char *host )
+ 	 * this is necessary for kerberos to work right, since the official
+ 	 * hostname is used as the kerberos instance.
+ 	 */
++	if ( !ldap_int_hostname )
++		ldap_int_resolve_hostname();
+ 
+ 	switch (sa->sa_family) {
+ #ifdef LDAP_PF_LOCAL
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index de5b7f7c84..d4e7ee0bf7 100644
+--- a/libraries/libldap/tls_g.c
++++ b/libraries/libldap/tls_g.c
+@@ -597,6 +597,9 @@ tlsg_session_chkhost( LDAP *ld, tls_session *session, const char *name_in )
+ 	int len1 = 0, len2 = 0;
+ 	int ntype = IS_DNS;
+ 
++	if ( !ldap_int_hostname )
++		ldap_int_resolve_hostname();
++
+ 	if( ldap_int_hostname &&
+ 		( !name_in || !strcasecmp( name_in, "localhost" ) ) )
+ 	{
+diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
+index 71677847a9..155f685c99 100644
+--- a/libraries/libldap/tls_o.c
++++ b/libraries/libldap/tls_o.c
+@@ -830,6 +830,9 @@ tlso_session_chkhost( LDAP *ld, tls_session *sess, const char *name_in )
+ 	struct in_addr addr;
+ #endif
+ 
++	if ( !ldap_int_hostname )
++		ldap_int_resolve_hostname();
++
+ 	if( ldap_int_hostname &&
+ 		( !name_in || !strcasecmp( name_in, "localhost" ) ) )
+ 	{
+-- 
+GitLab
+

openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch

@@ -0,0 +1,37 @@
+From 6779e56fafb0aa8ae5efa7068da34a630b51b530 Mon Sep 17 00:00:00 2001
+From: Simon Pichugin <spichugi@redhat.com>
+Date: Fri, 5 Aug 2022 13:23:52 -0700
+Subject: [PATCH] Add export symbols related to LDAP_CONNECTIONLESS
+
+---
+ libraries/liblber/lber.map | 1 +
+ libraries/libldap/ldap.map | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
+index 9a4094b0f..083cd1f32 100644
+--- a/libraries/liblber/lber.map
++++ b/libraries/liblber/lber.map
+@@ -121,6 +121,7 @@ OPENLDAP_2.200
+     ber_sockbuf_io_fd;
+     ber_sockbuf_io_readahead;
+     ber_sockbuf_io_tcp;
++    ber_sockbuf_io_udp;
+     ber_sockbuf_remove_io;
+     ber_sos_dump;
+     ber_start;
+diff --git a/libraries/libldap/ldap.map b/libraries/libldap/ldap.map
+index b28c9c21e..021aaba63 100644
+--- a/libraries/libldap/ldap.map
++++ b/libraries/libldap/ldap.map
+@@ -200,6 +200,7 @@ OPENLDAP_2.200
+     ldap_is_ldap_url;
+     ldap_is_ldapi_url;
+     ldap_is_ldaps_url;
++    ldap_is_ldapc_url;
+     ldap_is_read_ready;
+     ldap_is_write_ready;
+     ldap_ld_free;
+-- 
+2.37.1
+

openldap-add-tls-sni-support-to-libldap.patch

@@ -0,0 +1,197 @@
+From 19e631e977c4f57905b2380cf79ccaf8e6d99e9d Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Mon, 27 Apr 2020 03:41:12 +0100
+Subject: [PATCH 1/4] ITS#9176 Add TLS SNI support to libldap
+
+Implemented for OpenSSL, GnuTLS just stubbed
+---
+ libraries/libldap/ldap-tls.h | 2 +-
+ libraries/libldap/tls2.c     | 2 +-
+ libraries/libldap/tls_g.c    | 2 +-
+ libraries/libldap/tls_o.c    | 8 ++++++--
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/libraries/libldap/ldap-tls.h b/libraries/libldap/ldap-tls.h
+index c8a27112f1..c149b1867c 100644
+--- a/libraries/libldap/ldap-tls.h
++++ b/libraries/libldap/ldap-tls.h
+@@ -34,7 +34,7 @@ typedef void (TI_ctx_free)(tls_ctx *ctx);
+ typedef int (TI_ctx_init)(struct ldapoptions *lo, struct ldaptls *lt, int is_server);
+ 
+ typedef tls_session *(TI_session_new)(tls_ctx *ctx, int is_server);
+-typedef int (TI_session_connect)(LDAP *ld, tls_session *s);
++typedef int (TI_session_connect)(LDAP *ld, tls_session *s, const char *name_in);
+ typedef int (TI_session_accept)(tls_session *s);
+ typedef int (TI_session_upflags)(Sockbuf *sb, tls_session *s, int rc);
+ typedef char *(TI_session_errmsg)(tls_session *s, int rc, char *buf, size_t len );
+diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
+index 82ca5272cc..cbeea8c6c4 100644
+--- a/libraries/libldap/tls2.c
++++ b/libraries/libldap/tls2.c
+@@ -368,7 +368,7 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
+ 			lo->ldo_tls_connect_cb( ld, ssl, ctx, lo->ldo_tls_connect_arg );
+ 	}
+ 
+-	err = tls_imp->ti_session_connect( ld, ssl );
++	err = tls_imp->ti_session_connect( ld, ssl, host );
+ 
+ #ifdef HAVE_WINSOCK
+ 	errno = WSAGetLastError();
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index 3b72cd2a1f..5468ed3f05 100644
+--- a/libraries/libldap/tls_g.c
++++ b/libraries/libldap/tls_g.c
+@@ -336,7 +336,7 @@ tlsg_session_accept( tls_session *session )
+ }
+ 
+ static int
+-tlsg_session_connect( LDAP *ld, tls_session *session )
++tlsg_session_connect( LDAP *ld, tls_session *session, const char *name_in )
+ {
+ 	return tlsg_session_accept( session);
+ }
+diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
+index 498f805fa1..455b23c0e9 100644
+--- a/libraries/libldap/tls_o.c
++++ b/libraries/libldap/tls_o.c
+@@ -548,12 +548,16 @@ tlso_session_new( tls_ctx *ctx, int is_server )
+ }
+ 
+ static int
+-tlso_session_connect( LDAP *ld, tls_session *sess )
++tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
+ {
+ 	tlso_session *s = (tlso_session *)sess;
++	int rc;
+ 
++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++	SSL_set_tlsext_host_name( s, name_in );
++#endif
+ 	/* Caller expects 0 = success, OpenSSL returns 1 = success */
+-	int rc = SSL_connect( s ) - 1;
++	rc = SSL_connect( s ) - 1;
+ #ifdef LDAP_USE_NON_BLOCKING_TLS
+ 	if ( rc < 0 ) {
+ 		int sockerr = sock_errno();
+
+From 421c2021c7209bd7cd947ccb8b989bddab7b63cb Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Mon, 27 Apr 2020 18:25:10 +0100
+Subject: [PATCH 2/4] ITS#9176 check for numeric addrs before passing SNI
+
+---
+ libraries/libldap/tls2.c  | 22 +++++++++++++++++++++-
+ libraries/libldap/tls_o.c |  4 +++-
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
+index cbeea8c6c4..85628bc3b3 100644
+--- a/libraries/libldap/tls2.c
++++ b/libraries/libldap/tls2.c
+@@ -334,6 +334,7 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
+ 	Sockbuf *sb = conn->lconn_sb;
+ 	int	err;
+ 	tls_session	*ssl = NULL;
++	char *sni = host;
+ 
+ 	if ( HAS_TLS( sb )) {
+ 		ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_SSL, (void *)&ssl );
+@@ -368,7 +369,26 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
+ 			lo->ldo_tls_connect_cb( ld, ssl, ctx, lo->ldo_tls_connect_arg );
+ 	}
+ 
+-	err = tls_imp->ti_session_connect( ld, ssl, host );
++	/* pass hostname for SNI, but only if it's an actual name
++	 * and not a numeric address
++	 */
++	{
++		int numeric = 1;
++		char *c;
++		for ( c = sni; *c; c++ ) {
++			if ( *c == ':' )	/* IPv6 address */
++				break;
++			if ( *c == '.' )
++				continue;
++			if ( !isdigit( *c )) {
++				numeric = 0;
++				break;
++			}
++		}
++		if ( numeric )
++			sni = NULL;
++	}
++	err = tls_imp->ti_session_connect( ld, ssl, sni );
+ 
+ #ifdef HAVE_WINSOCK
+ 	errno = WSAGetLastError();
+diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
+index 455b23c0e9..45948dbc64 100644
+--- a/libraries/libldap/tls_o.c
++++ b/libraries/libldap/tls_o.c
+@@ -554,7 +554,9 @@ tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
+ 	int rc;
+ 
+ #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+-	SSL_set_tlsext_host_name( s, name_in );
++	if ( name_in ) {
++		SSL_set_tlsext_host_name( s, name_in );
++	}
+ #endif
+ 	/* Caller expects 0 = success, OpenSSL returns 1 = success */
+ 	rc = SSL_connect( s ) - 1;
+
+From 05a65a46c684031a841bcc39cf01a82e8cc713a0 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Mon, 27 Apr 2020 18:54:02 +0100
+Subject: [PATCH 3/4] ITS#9176 check for failure setting SNI
+
+---
+ libraries/libldap/tls_o.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
+index 45948dbc64..86e86db3b6 100644
+--- a/libraries/libldap/tls_o.c
++++ b/libraries/libldap/tls_o.c
+@@ -555,7 +555,9 @@ tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
+ 
+ #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+ 	if ( name_in ) {
+-		SSL_set_tlsext_host_name( s, name_in );
++		rc = SSL_set_tlsext_host_name( s, name_in );
++		if ( !rc )		/* can fail to strdup the name */
++			return -1;
+ 	}
+ #endif
+ 	/* Caller expects 0 = success, OpenSSL returns 1 = success */
+
+From d059488fa86b58744ad70819516d3bf4a37dbb8e Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan@nardis.ca>
+Date: Mon, 27 Apr 2020 11:01:01 -0700
+Subject: [PATCH 4/4] ITS#9176 Implement SNI for GnuTLS
+
+---
+ libraries/libldap/tls_g.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index 5468ed3f05..5fceb3e935 100644
+--- a/libraries/libldap/tls_g.c
++++ b/libraries/libldap/tls_g.c
+@@ -338,6 +338,16 @@ tlsg_session_accept( tls_session *session )
+ static int
+ tlsg_session_connect( LDAP *ld, tls_session *session, const char *name_in )
+ {
++	tlsg_session *s = (tlsg_session *)session;
++	int rc;
++
++	if ( name_in ) {
++		rc = gnutls_server_name_set( s->session, GNUTLS_NAME_DNS, name_in, strlen(name_in) );
++		if ( rc != GNUTLS_E_SUCCESS ) {
++			return rc;
++		}
++	}
++
+ 	return tlsg_session_accept( session);
+ }
+ 

openldap-ai-addrconfig.patch

@@ -5,10 +5,10 @@ Upstream ITS: #7326
 Resolves: #835013
 
 diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
-index b31e05d..fa361ab 100644
+index 14899cc..b25e750 100644
 --- a/libraries/libldap/os-ip.c
 +++ b/libraries/libldap/os-ip.c
-@@ -594,8 +594,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
+@@ -620,8 +620,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
  
  #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
  	memset( &hints, '\0', sizeof(hints) );

openldap-allop-overlay.patch

@@ -4,9 +4,10 @@ Author: Matus Honek <mhonek@redhat.com>
 Resolves: #1319782
 
 diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
+index b5c3fc8..9aa8a4f 100644
 --- a/servers/slapd/overlays/Makefile.in
 +++ b/servers/slapd/overlays/Makefile.in
-@@ -33,7 +33,8 @@ SRCS = overlays.c \
+@@ -38,7 +38,8 @@ SRCS = overlays.c \
  	translucent.c \
  	unique.c \
  	valsort.c \
@@ -16,7 +17,7 @@ diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefil
  OBJS = statover.o \
  	@SLAPD_STATIC_OVERLAYS@ \
  	overlays.o
-@@ -53,7 +54,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+@@ -58,7 +59,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  
  LIBRARY = ../liboverlays.a
@@ -25,7 +26,7 @@ diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefil
  
  XINCPATH = -I.. -I$(srcdir)/..
  XDEFS = $(MODULES_CPPFLAGS)
-@@ -125,6 +126,12 @@ unique.la : unique.lo
+@@ -148,6 +149,12 @@ smbk5pwd.lo : smbk5pwd.c
  smbk5pwd.la : smbk5pwd.lo
  	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
  

openldap-autoconf-pkgconfig-nss.patch

@@ -1,49 +0,0 @@
-Use pkg-config for Mozilla NSS library detection
-
-Author: Jan Vcelak <jvcelak@redhat.com>
-
----
- configure.in | 22 +++++-----------------
- 1 file changed, 5 insertions(+), 17 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index ecffe30..2a9cfb4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1223,28 +1223,16 @@ if test $ol_link_tls = no ; then
- 	fi
- fi
- 
--dnl NOTE: caller must specify -I/path/to/nspr4 and -I/path/to/nss3
--dnl and -L/path/to/nspr4 libs and -L/path/to/nss3 libs if those libs
--dnl are not in the default system location
- if test $ol_link_tls = no ; then
- 	if test $ol_with_tls = moznss || test $ol_with_tls = auto ; then
--		have_moznss=no
--		AC_CHECK_HEADERS([nssutil.h])
--		if test "$ac_cv_header_nssutil_h" = yes ; then
--			AC_CHECK_LIB([nss3], [NSS_Initialize],
--						 [ have_moznss=yes ], [ have_moznss=no ])
--		fi
-+		PKG_CHECK_MODULES(MOZNSS, [nss nspr], [have_moznss=yes], [have_moznss=no])
- 
--		if test "$have_moznss" = yes ; then
-+		if test $have_moznss = yes ; then
- 			ol_with_tls=moznss
- 			ol_link_tls=yes
--			AC_DEFINE(HAVE_MOZNSS, 1, 
--					  [define if you have MozNSS])
--			TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
--		else
--			if test $ol_with_tls = moznss ; then
--			AC_MSG_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)])
--			fi
-+			AC_DEFINE(HAVE_MOZNSS, 1, [define if you have MozNSS])
-+			TLS_LIBS="$MOZNSS_LIBS"
-+			CFLAGS="$CFLAGS $MOZNSS_CFLAGS"
- 		fi
- 	fi
- fi
--- 
-1.7.11.7
-

openldap-configure-c99.patch

@@ -0,0 +1,906 @@
+commit 14f81bc47a4c462ccc609fce74feb014185e2bf9
+Author: Sam James <sam@gentoo.org>
+Date:   Thu Feb 9 23:17:53 2023 +0000
+
+    ITS#10011 build: fix compatibility with stricter C99 compilers
+    
+    Fix the following warnings:
+    - -Wimplicit-int (fatal with Clang 16)
+    - -Wimplicit-function-declaration (fatal with Clang 16)
+    - -Wincompatible-function-pointer-types (fatal with Clang 16)
+    - -Wint-conversion (fatal with Clang 15)
+    - Old style prototypes (K&R, removed from C23)
+    
+    These warnings-now-error led to misconfigurations and failure to build
+    OpenLDAP, as the tests used during configure caused the wrong results
+    to be emitted.
+    
+    For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+    or the (new) c-std-porting mailing list [3].
+    
+    [0] https://lwn.net/Articles/913505/
+    [1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+    [2] https://wiki.gentoo.org/wiki/Modern_C_porting
+    [3] hosted at lists.linux.dev.
+    
+    Bug: https://bugs.gentoo.org/871288
+    Signed-off-by: Sam James <sam@gentoo.org>
+
+diff -ur openldap-2.6.4.orig/openldap-2.6.4/build/openldap.m4 openldap-2.6.4/openldap-2.6.4/build/openldap.m4
+--- openldap-2.6.4.orig/openldap-2.6.4/build/openldap.m4	2023-02-08 19:53:35.000000000 +0100
++++ openldap-2.6.4/openldap-2.6.4/build/openldap.m4	2023-04-15 19:21:07.377380382 +0200
+@@ -154,6 +154,7 @@
+ if test $ol_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
++#include <stdlib.h>
+ #ifndef HAVE_EBCDIC
+ #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -303,8 +304,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -360,9 +365,13 @@
+ AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
+ [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+@@ -484,7 +493,7 @@
+ #include <sys/types.h>
+ #include <regex.h>
+ static char *pattern, *string;
+-main()
++int main(void)
+ {
+ 	int rc;
+ 	regex_t re;
+@@ -511,7 +520,8 @@
+ [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <ctype.h>
+-main()
++#include <stdlib.h>
++int main(void)
+ {
+ 	if ('C' == toupper('C'))
+ 		exit(0);
+@@ -569,7 +579,7 @@
+ 			]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
+ 	else
+ 		AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-			main() {
++			int main(void) {
+ 				char buf[100];
+ 				buf[0] = 0;
+ 				strerror_r( 1, buf, sizeof buf );
+diff -ur openldap-2.6.4.orig/openldap-2.6.4/configure openldap-2.6.4/openldap-2.6.4/configure
+--- openldap-2.6.4.orig/openldap-2.6.4/configure	2023-02-08 19:53:35.000000000 +0100
++++ openldap-2.6.4/openldap-2.6.4/configure	2023-04-15 19:23:17.437078213 +0200
+@@ -14978,6 +14966,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #ifndef HAVE_EBCDIC
+ #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -15946,6 +15935,10 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
++#ifdef HAVE_SYS_POLL_H
++#include <sys/epoll.h>
++#endif
+ int main(int argc, char **argv)
+ {
+ 	int epfd = epoll_create(256);
+@@ -16126,7 +16119,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-			main() {
++			int main(void) {
+ 				char buf[100];
+ 				buf[0] = 0;
+ 				strerror_r( 1, buf, sizeof buf );
+@@ -16326,7 +16319,7 @@
+ #include <sys/types.h>
+ #include <regex.h>
+ static char *pattern, *string;
+-main()
++int main(void)
+ {
+ 	int rc;
+ 	regex_t re;
+@@ -17559,16 +17552,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -17664,8 +17665,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -17744,16 +17749,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -17854,8 +17867,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -17934,16 +17951,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -18044,8 +18069,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -18124,16 +18153,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -18234,8 +18271,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -18314,16 +18355,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -18424,8 +18473,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -18504,16 +18557,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -18615,8 +18676,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -18695,16 +18760,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -18805,8 +18878,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -18885,16 +18962,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -18996,8 +19081,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -19076,16 +19165,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -19187,8 +19284,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -19267,16 +19368,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -19377,8 +19486,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -19457,16 +19570,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -19568,8 +19689,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -19648,16 +19773,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -19759,8 +19892,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -19839,16 +19976,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -19949,8 +20094,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -20029,16 +20178,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -20139,8 +20296,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -20219,16 +20380,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -20330,8 +20499,12 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+@@ -20410,16 +20583,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -20631,14 +20812,12 @@
+ /* end confdefs.h.  */
+ 
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
++pthread_t thread;
+ 
+ int
+ main ()
+ {
+-pthread_detach(NULL);
++pthread_detach(thread);
+   ;
+   return 0;
+ }
+@@ -20752,16 +20931,24 @@
+ #define NULL (void*)0
+ #endif
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	return (void *) (p == NULL);
+ }
+ 
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 
+ 	/* pthread test function */
+@@ -20851,6 +21038,9 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#define _XOPEN_SOURCE 500               /* For pthread_setconcurrency() on glibc */
++#include <stdlib.h>
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+@@ -20861,8 +21051,12 @@
+ 
+ static int fildes[2];
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	int i;
+ 	struct timeval tv;
+@@ -20886,9 +21080,13 @@
+ 	exit(0); /* if we exit here, the select blocked the whole process */
+ }
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 	pthread_t t;
+ 
+@@ -23241,7 +23439,8 @@
+ /* end confdefs.h.  */
+ 
+ #include <ctype.h>
+-main()
++#include <stdlib.h>
++int main(void)
+ {
+ 	if ('C' == toupper('C'))
+ 		exit(0);
+diff -ur openldap-2.6.4.orig/openldap-2.6.4/configure.ac openldap-2.6.4/openldap-2.6.4/configure.ac
+--- openldap-2.6.4.orig/openldap-2.6.4/configure.ac	2023-02-08 19:53:35.000000000 +0100
++++ openldap-2.6.4/openldap-2.6.4/configure.ac	2023-04-15 19:21:07.377380382 +0200
+@@ -1003,7 +1003,11 @@
+ AC_CHECK_HEADERS( sys/epoll.h )
+ if test "${ac_cv_header_sys_epoll_h}" = yes; then
+ 	AC_MSG_CHECKING(for epoll system call)
+-	AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv)
++	AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
++#ifdef HAVE_SYS_POLL_H
++#include <sys/epoll.h>
++#endif
++int main(int argc, char **argv)
+ {
+ 	int epfd = epoll_create(256);
+ 	exit (epfd == -1 ? 1 : 0);
+@@ -1356,10 +1360,10 @@
+ 		dnl 	pthread_create() in -lpthread (many)
+ 		dnl 	pthread_create() in -lc_r (FreeBSD)
+ 		dnl
+-		dnl Check pthread (draft4) flags (depreciated)
++		dnl Check pthread (draft4) flags (deprecated)
+ 		dnl 	pthread_create() with -threads (OSF/1)
+ 		dnl
+-		dnl Check pthread (draft4) libraries (depreciated)
++		dnl Check pthread (draft4) libraries (deprecated)
+ 		dnl 	pthread_mutex_unlock() in -lpthreads -lmach -lexc -lc_r (OSF/1)
+ 		dnl 	pthread_mutex_lock() in -lpthreads -lmach -lexc (OSF/1)
+ 		dnl 	pthread_mutex_trylock() in -lpthreads -lexc (OSF/1)
+@@ -1378,7 +1382,7 @@
+ 			ol_link_threads=posix
+ 			ol_link_pthreads=""
+ 		fi
+-		
++
+ dnl		OL_PTHREAD_TRY([-mt],		[ol_cv_pthread_mt])
+ 		OL_PTHREAD_TRY([-kthread],	[ol_cv_pthread_kthread])
+ 		OL_PTHREAD_TRY([-pthread],	[ol_cv_pthread_pthread])
+@@ -1465,10 +1469,8 @@
+ 				dnl save the flags
+ 				AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
++pthread_t thread;
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
+ 			])
+ 
+ 			if test $ol_cv_func_pthread_detach = no ; then
+@@ -1523,6 +1525,9 @@
+ 				AC_CACHE_CHECK([if select yields when using pthreads],
+ 					ol_cv_pthread_select_yields,[
+ 				AC_RUN_IFELSE([AC_LANG_SOURCE([[
++#define _XOPEN_SOURCE 500               /* For pthread_setconcurrency() on glibc */
++#include <stdlib.h>
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+@@ -1533,8 +1538,12 @@
+ 
+ static int fildes[2];
+ 
++#ifdef __STDC__
++static void *task(void *p)
++#else
+ static void *task(p)
+ 	void *p;
++#endif
+ {
+ 	int i;
+ 	struct timeval tv;
+@@ -1558,9 +1567,13 @@
+ 	exit(0); /* if we exit here, the select blocked the whole process */
+ }
+ 
++#ifdef __STDC__
++int main(int argc, char **argv)
++#else
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
++#endif
+ {
+ 	pthread_t t;
+ 

openldap-doc1.patch

@@ -1,36 +0,0 @@
-Upstream ITS: #7568
-
-From 6be982c000133ccf9da949d39eed23a93bc7bfc5 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek@redhat.com>
-Date: Tue, 9 Apr 2013 12:41:38 +0200
-Subject: [PATCH 1/2] Fix typos in ldap.conf.5
-
----
- doc/man/man5/ldap.conf.5 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index cfde143..8f7fecd 100644
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
-@@ -297,7 +297,7 @@ Specifies if GSSAPI encryption (GSS_C_INTEG_FLAG and GSS_C_CONF_FLAG)
- should be used. The default is off.
- .TP
- .B GSSAPI_ALLOW_REMOTE_PRINCIPAL <on/true/yes/off/false/no>
--Specifies if GSSAPI based authentification should try to form the
-+Specifies if GSSAPI based authentication should try to form the
- target principal name out of the ldapServiceName or dnsHostName
- attribute of the targets RootDSE entry. The default is off.
- .SH TLS OPTIONS
-@@ -354,7 +354,7 @@ it is of critical importance that the key file is protected carefully.
- When using Mozilla NSS, TLS_KEY specifies the name of a file that contains
- the password for the key for the certificate specified with TLS_CERT.  The
- modutil command can be used to turn off password protection for the cert/key
--database.  For example, if TLS_CACERTDIR specifes /home/scarter/.moznss as
-+database.  For example, if TLS_CACERTDIR specifies /home/scarter/.moznss as
- the location of the cert/key database, use modutil to change the password
- to the empty string:
- .nf
--- 
-1.8.1.4
-

openldap-doc2.patch

@@ -1,27 +0,0 @@
-Upstream ITS: #7568
-
-From 05c726c62785b2c307f9c5343a253d43ec7322c6 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek@redhat.com>
-Date: Tue, 9 Apr 2013 12:42:31 +0200
-Subject: [PATCH 2/2] Add -Q to slaptest's help
-
----
- servers/slapd/slapcommon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
-index 714e2bc..153310f 100644
---- a/servers/slapd/slapcommon.c
-+++ b/servers/slapd/slapcommon.c
-@@ -92,7 +92,7 @@ usage( int tool, const char *progname )
- 		break;
- 
- 	case SLAPTEST:
--		options = " [-n databasenumber] [-u]\n";
-+		options = " [-n databasenumber] [-u] [-Q]\n";
- 		break;
- 
- 	case SLAPSCHEMA:
--- 
-1.8.1.4
-

openldap-explicitly-cast-private-values.patch

@@ -0,0 +1,70 @@
+From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Tue, 6 Feb 2024 21:38:24 -0500
+Subject: [PATCH] ITS#10171 - Explicitly cast private values
+
+Fixes issues with -Werror=incompatible-pointer-types
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+---
+ servers/slapd/config.c              | 2 +-
+ servers/slapd/overlays/constraint.c | 2 +-
+ servers/slapd/overlays/dyngroup.c   | 2 +-
+ servers/slapd/overlays/valsort.c    | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/servers/slapd/config.c b/servers/slapd/config.c
+index 80333f359c..987c862d91 100644
+--- a/servers/slapd/config.c
++++ b/servers/slapd/config.c
+@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
+ 	int rc, arg_user, arg_type, arg_syn, iarg;
+ 	unsigned uiarg;
+ 	long larg;
+-	size_t ularg;
++	unsigned long ularg;
+ 	ber_len_t barg;
+ 	
+ 	if(Conf->arg_type == ARG_IGNORED) {
+diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
+index f939b37762..0d6156af4d 100644
+--- a/servers/slapd/overlays/constraint.c
++++ b/servers/slapd/overlays/constraint.c
+@@ -557,7 +557,7 @@ done:;
+ 				a2->restrict_filter = ap.restrict_filter;
+ 				a2->restrict_val = ap.restrict_val;
+ 
+-				for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
++				for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+ 					/* Get to the end */ ;
+ 
+ 				a2->ap_next = *app;
+diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
+index 5d890d6650..e0e70af2d9 100644
+--- a/servers/slapd/overlays/dyngroup.c
++++ b/servers/slapd/overlays/dyngroup.c
+@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c )
+ 		 */
+ 		a2 = ch_malloc( sizeof(adpair) );
+ 
+-		for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
++		for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+ 			/* Get to the end */ ;
+ 
+ 		a2->ap_mem = ap.ap_mem;
+diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
+index 3d998e2fcb..e251500d0b 100644
+--- a/servers/slapd/overlays/valsort.c
++++ b/servers/slapd/overlays/valsort.c
+@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) {
+ 		return(1);
+ 	}
+ 
+-	for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
++	for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
+ 		/* Get to the end */ ;
+ 
+ 	vi = ch_malloc( sizeof(valsort_info) );
+-- 
+GitLab
+

openldap-ldapi-sasl.patch

@@ -1,55 +0,0 @@
-From 69709289b083c53ba41d2cef7d65120220f8c59b Mon Sep 17 00:00:00 2001
-From: Sumit Bose <sbose@redhat.com>
-Date: Tue, 7 May 2013 17:02:57 +0200
-Subject: [PATCH] LDAPI SASL fix
-
-Resolves: #960222
----
- libraries/libldap/cyrus.c | 19 ++++++++++++++++---
- 1 Datei geändert, 16 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
-
-diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
-index 28c241b..a9acf36 100644
---- a/libraries/libldap/cyrus.c
-+++ b/libraries/libldap/cyrus.c
-@@ -394,6 +394,8 @@ ldap_int_sasl_bind(
- 	struct berval	ccred = BER_BVNULL;
- 	int saslrc, rc;
- 	unsigned credlen;
-+	char my_hostname[HOST_NAME_MAX + 1];
-+	int free_saslhost = 0;
- 
- 	Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
- 		mechs ? mechs : "<null>", 0, 0 );
-@@ -454,14 +456,25 @@ ldap_int_sasl_bind(
- 
- 			/* If we don't need to canonicalize just use the host
- 			 * from the LDAP URI.
-+			 * Always use the result of gethostname() for LDAPI.
- 			 */
--			if ( nocanon )
-+			if (ld->ld_defconn->lconn_server->lud_scheme != NULL &&
-+			    strcmp("ldapi", ld->ld_defconn->lconn_server->lud_scheme) == 0) {
-+				rc = gethostname(my_hostname, HOST_NAME_MAX + 1);
-+				if (rc == 0) {
-+					saslhost = my_hostname;
-+				} else {
-+					saslhost = "localhost";
-+				}
-+			} else if ( nocanon )
- 				saslhost = ld->ld_defconn->lconn_server->lud_host;
--			else 
-+			else {
- 				saslhost = ldap_host_connected_to( ld->ld_defconn->lconn_sb,
- 				"localhost" );
-+				free_saslhost = 1;
-+			}
- 			rc = ldap_int_sasl_open( ld, ld->ld_defconn, saslhost );
--			if ( !nocanon )
-+			if ( free_saslhost )
- 				LDAP_FREE( saslhost );
- 		}
- 
--- 
-1.7.11.7
-

openldap-libldap-avoid-SSL-context-cleanup-during-library-des.patch

@@ -0,0 +1,92 @@
+From 5f4569f0605a73eb1a282ee5251ead073ed3b26e Mon Sep 17 00:00:00 2001
+From: Simon Pichugin <spichugi@redhat.com>
+Date: Tue, 26 Nov 2024 12:32:07 -0800
+Subject: [PATCH] libldap: avoid SSL context cleanup during library destruction
+
+Given that libldap can be pulled into random applications and applications
+are allowed to call OPENSSL_cleanup() before exiting, the only sane thing
+to do is to avoid trying to touch SSL context in ldap destructors, and just
+let them leak if the application does not explicitly free the ldap context.
+
+Add ldap_int_tls_destroy_safe() which skips SSL context cleanup while
+maintaining all other cleanup operations, and use it in the library
+destructor path.
+
+Fixes: https://bugs.openldap.org/show_bug.cgi?id=9952
+---
+ libraries/libldap/init.c     |  2 +-
+ libraries/libldap/ldap-int.h |  1 +
+ libraries/libldap/tls2.c     | 25 +++++++++++++++++++++----
+ 3 files changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index 213276b4b5..aa017f4128 100644
+--- a/libraries/libldap/init.c
++++ b/libraries/libldap/init.c
+@@ -545,7 +545,7 @@ ldap_int_destroy_global_options(void)
+ 	}
+ #endif
+ #ifdef HAVE_TLS
+-	ldap_int_tls_destroy( gopts );
++	ldap_int_tls_destroy_safe( gopts );
+ #endif
+ }
+ 
+diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
+index 7e754775e8..b73097ccc7 100644
+--- a/libraries/libldap/ldap-int.h
++++ b/libraries/libldap/ldap-int.h
+@@ -914,6 +914,7 @@ LDAP_F (int) ldap_int_tls_start LDAP_P(( LDAP *ld,
+ 	LDAPConn *conn, LDAPURLDesc *srv ));
+ 
+ LDAP_F (void) ldap_int_tls_destroy LDAP_P(( struct ldapoptions *lo ));
++LDAP_F (void) ldap_int_tls_destroy_safe LDAP_P(( struct ldapoptions *lo ));
+ 
+ /*
+  *	in getvalues.c
+diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
+index 0841005a59..82f8573602 100644
+--- a/libraries/libldap/tls2.c
++++ b/libraries/libldap/tls2.c
+@@ -97,10 +97,14 @@ tls_ctx_ref( tls_ctx *ctx )
+ static ldap_pvt_thread_mutex_t tls_def_ctx_mutex;
+ #endif
+ 
+-void
+-ldap_int_tls_destroy( struct ldapoptions *lo )
+-{
+-	if ( lo->ldo_tls_ctx ) {
++/*
++ * Implementation function that handles all cleanup.
++ * skip_ctx_cleanup: 1 when called from destructor, 0 for normal operation
++ */
++static void
++ldap_int_tls_destroy_impl( struct ldapoptions *lo, int skip_ctx_cleanup )
++ {
++	if ( lo->ldo_tls_ctx && !skip_ctx_cleanup ) {
+ 		ldap_pvt_tls_ctx_free( lo->ldo_tls_ctx );
+ 		lo->ldo_tls_ctx = NULL;
+ 	}
+@@ -147,6 +151,19 @@ ldap_int_tls_destroy( struct ldapoptions *lo )
+ 	BER_BVZERO( &lo->ldo_tls_pin );
+ }
+ 
++
++void
++ldap_int_tls_destroy( struct ldapoptions *lo )
++{
++	ldap_int_tls_destroy_impl(lo, 0);
++}
++
++/* Safe version for destructor use */
++void ldap_int_tls_destroy_safe( struct ldapoptions *lo )
++{
++	ldap_int_tls_destroy_impl(lo, 1);
++}
++
+ /*
+  * Tear down the TLS subsystem. Should only be called once.
+  */
+-- 
+2.47.0
+

openldap-loglevel2bvarray.patch

@@ -1,27 +0,0 @@
-From 4313b91b0bc2fe6585656cd69a03f9755b5af3c4 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek@redhat.com>
-Date: Wed, 29 May 2013 10:21:40 +0200
-Subject: [PATCH] Fix loglevel2bvarray
-
----
- servers/slapd/bconfig.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
-index 4e1f1b5..def6daf 100644
---- a/servers/slapd/bconfig.c
-+++ b/servers/slapd/bconfig.c
-@@ -3622,6 +3622,10 @@ loglevel2bvarray( int l, BerVarray *bva )
- 		loglevel_init();
- 	}
- 
-+	if ( l == 0 ) {
-+		return value_add_one( bva, ber_bvstr( "0" ) );
-+	}
-+
- 	return mask_to_verbs( loglevel_ops, l, bva );
- }
- 
--- 
-1.8.1.4
-

openldap-manpages.patch

@@ -1,35 +1,20 @@
 Various manual pages changes:
 * removes LIBEXECDIR from slapd.8
-* removes references to non-existing manpages (bz 624616)
 
-diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
-index 3def6da..466c772 100644
---- a/doc/man/man1/ldapmodify.1
-+++ b/doc/man/man1/ldapmodify.1
-@@ -397,8 +397,7 @@ exit status and a diagnostic message being written to standard error.
- .BR ldap_add_ext (3),
- .BR ldap_delete_ext (3),
- .BR ldap_modify_ext (3),
--.BR ldap_modrdn_ext (3),
--.BR ldif (5).
-+.BR ldif (5)
- .SH AUTHOR
- The OpenLDAP Project <http://www.openldap.org/>
- .SH ACKNOWLEDGEMENTS
 diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index cfde143..63592cb 100644
+index d47481d6ed..ff86fc52ca 100644
 --- a/doc/man/man5/ldap.conf.5
 +++ b/doc/man/man5/ldap.conf.5
-@@ -317,6 +317,7 @@ certificates in separate individual files. The
+@@ -341,6 +341,7 @@ be specified, separated by a semi-colon.  The
  .B TLS_CACERT
  is always used before
- .B TLS_CACERTDIR.
+ .BR TLS_CACERTDIR .
 +The specified directory must be managed with the OpenSSL c_rehash utility.
- This parameter is ignored with GnuTLS.
- 
- When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
+ .TP
+ .B TLS_CERT <filename>
+ Specifies the file that contains the client certificate.
 diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
-index b739f4d..e2a1a00 100644
+index 807634e52d..a06110687b 100644
 --- a/doc/man/man8/slapd.8
 +++ b/doc/man/man8/slapd.8
 @@ -5,7 +5,7 @@
@@ -39,18 +24,18 @@ index b739f4d..e2a1a00 100644
 -.B LIBEXECDIR/slapd 
 +.B slapd
  [\c
- .BR \-4 | \-6 ]
+ .BR \-V [ V [ V ]]
  [\c
-@@ -317,7 +317,7 @@ the LDAP databases defined in the default config file, just type:
+@@ -333,7 +333,7 @@ the LDAP databases defined in the default config file, just type:
  .LP
  .nf
  .ft tt
 -	LIBEXECDIR/slapd
-+	slapd
++        slapd
  .ft
  .fi
  .LP
-@@ -328,7 +328,7 @@ on voluminous debugging which will be printed on standard error, type:
+@@ -344,7 +344,7 @@ on voluminous debugging which will be printed on standard error, type:
  .LP
  .nf
  .ft tt
@@ -59,7 +44,7 @@ index b739f4d..e2a1a00 100644
  .ft
  .fi
  .LP
-@@ -336,7 +336,7 @@ To test whether the configuration file is correct or not, type:
+@@ -352,7 +352,7 @@ To test whether the configuration file is correct or not, type:
  .LP
  .nf
  .ft tt
@@ -68,6 +53,3 @@ index b739f4d..e2a1a00 100644
  .ft
  .fi
  .LP
--- 
-1.8.1.4
-

openldap-nss-allow-certname-with-token-name.patch

@@ -1,47 +0,0 @@
-Accept nss certificate name in the form of tokenname:certnickname
-
-Author: Rich Megginson <rmeggins@redhat.com>
-Upstream ITS: #7360
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 5022efb..7377bb1 100644
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -2102,6 +2102,22 @@ tlsm_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
- 	return 0;
- }
- 
-+/* returns true if the given string looks like 
-+   "tokenname" ":" "certnickname"
-+   This is true if there is a ':' colon character
-+   in the string and the colon is not the first
-+   or the last character in the string
-+*/
-+static int
-+tlsm_is_tokenname_certnick( const char *certfile )
-+{
-+	if ( certfile ) {
-+		const char *ptr = PL_strchr( certfile, ':' );
-+		return ptr && (ptr != certfile) && (*(ptr+1));
-+	}
-+	return 0;
-+}
-+
- static int
- tlsm_deferred_ctx_init( void *arg )
- {
-@@ -2268,7 +2284,10 @@ tlsm_deferred_ctx_init( void *arg )
- 		} else {
- 			char *tmp_certname;
- 
--			if (ctx->tc_certdb_slot) {
-+			if (tlsm_is_tokenname_certnick(lt->lt_certfile)) {
-+				/* assume already in form tokenname:certnickname */
-+				tmp_certname = PL_strdup(lt->lt_certfile);
-+			} else if (ctx->tc_certdb_slot) {
- 				tmp_certname = PR_smprintf(TLSM_CERTDB_DESC_FMT ":%s", ctx->tc_unique, lt->lt_certfile);
- 			} else {
- 				tmp_certname = PR_smprintf("%s", lt->lt_certfile);
--- 
-1.7.11.4
-

openldap-nss-certs-from-certdb-fallback-pem.patch

@@ -1,86 +0,0 @@
-MozNSS: load certificates from certdb, fallback to PEM
-
-If TLS_CACERT pointed to a PEM file and TLS_CACERTDIR was set to NSS
-certificate database, the backend assumed that the certificate is always
-located in the certificate database. This assumption might be wrong.
-
-This patch makes the library to try to load the certificate from NSS
-database and fallback to PEM file if unsuccessfull.
-
-Author: Jan Vcelak <jvcelak@redhat.com>
-Upstream ITS: #7389
-Resolves: #857455
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 6847bea..8339391 100644
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -1412,7 +1412,7 @@ tlsm_ctx_load_private_key( tlsm_ctx *ctx )
- 	/* prefer unlocked key, then key from opened certdb, then any other */
- 	if ( unlocked_key )
- 		ctx->tc_private_key = unlocked_key;
--	else if ( ctx->tc_certdb_slot )
-+	else if ( ctx->tc_certdb_slot && !ctx->tc_using_pem )
- 		ctx->tc_private_key = PK11_FindKeyByDERCert( ctx->tc_certdb_slot, ctx->tc_certificate, pin_arg );
- 	else
- 		ctx->tc_private_key = PK11_FindKeyByAnyCert( ctx->tc_certificate, pin_arg );
-@@ -1909,8 +1909,6 @@ tlsm_deferred_init( void *arg )
- 				}
- 				return -1;
- 			}
--
--			ctx->tc_using_pem = PR_TRUE;
- 		}
- 
- 		NSS_SetDomesticPolicy();
-@@ -2363,15 +2361,9 @@ tlsm_deferred_ctx_init( void *arg )
- 
- 	/* set up our cert and key, if any */
- 	if ( lt->lt_certfile ) {
--		/* if using the PEM module, load the PEM file specified by lt_certfile */
--		/* otherwise, assume this is the name of a cert already in the db */
--		if ( ctx->tc_using_pem ) {
--			/* this sets ctx->tc_certificate to the correct value */
--			int rc = tlsm_add_cert_from_file( ctx, lt->lt_certfile, PR_FALSE );
--			if ( rc ) {
--				return rc;
--			}
--		} else {
-+
-+		/* first search in certdb (lt_certfile is nickname) */
-+		if ( ctx->tc_certdb ) {
- 			char *tmp_certname;
- 
- 			if ( tlsm_is_tokenname_certnick( lt->lt_certfile )) {
-@@ -2391,8 +2383,31 @@ tlsm_deferred_ctx_init( void *arg )
- 				Debug( LDAP_DEBUG_ANY,
- 					   "TLS: error: the certificate '%s' could not be found in the database - error %d:%s.\n",
- 					   lt->lt_certfile, errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ) );
-+			}
-+		}
-+
-+		/* fallback to PEM module (lt_certfile is filename) */
-+		if ( !ctx->tc_certificate ) {
-+			if ( !pem_module && tlsm_init_pem_module() ) {
-+				int pem_errcode = PORT_GetError();
-+				Debug( LDAP_DEBUG_ANY,
-+					   "TLS: fallback to PEM impossible, module cannot be loaded - error %d:%s.\n",
-+					   pem_errcode, PR_ErrorToString( pem_errcode, PR_LANGUAGE_I_DEFAULT ), 0 );
- 				return -1;
- 			}
-+
-+			/* this sets ctx->tc_certificate to the correct value */
-+			if ( !tlsm_add_cert_from_file( ctx, lt->lt_certfile, PR_FALSE ) ) {
-+				ctx->tc_using_pem = PR_TRUE;
-+			}
-+		}
-+
-+		if ( ctx->tc_certificate ) {
-+			Debug( LDAP_DEBUG_ANY,
-+				   "TLS: certificate '%s' successfully loaded from %s.\n", lt->lt_certfile,
-+				   ctx->tc_using_pem ? "PEM file" : "moznss database", 0);
-+		} else {
-+			return -1;
- 		}
- 	}
- 

openldap-nss-cipher-attributes.patch

@@ -1,95 +0,0 @@
-Update MozNSS cipher attributes definitions
-
-Author: Matus Honek <mhonek@redhat.com>
-PreviousAuthor: Jan Vcelak <jvcelak@redhat.com>
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -210,27 +210,44 @@ typedef struct {
- 	int num;            /* The cipher id */
- 	int attr;           /* cipher attributes: algorithms, etc */
- 	int version;        /* protocol version valid for this cipher */
--	int bits;           /* bits of strength */
--	int alg_bits;       /* bits of the algorithm */
- 	int strength;       /* LOW, MEDIUM, HIGH */
- 	int enabled;        /* Enabled by default? */
- } cipher_properties;
- 
- /* cipher attributes  */
--#define SSL_kRSA  0x00000001L
--#define SSL_aRSA  0x00000002L
--#define SSL_aDSS  0x00000004L
--#define SSL_DSS   SSL_aDSS
--#define SSL_eNULL 0x00000008L
--#define SSL_DES   0x00000010L
--#define SSL_3DES  0x00000020L
--#define SSL_RC4   0x00000040L
--#define SSL_RC2   0x00000080L
--#define SSL_AES   0x00000100L
--#define SSL_MD5   0x00000200L
--#define SSL_SHA1  0x00000400L
--#define SSL_SHA   SSL_SHA1
--#define SSL_RSA   (SSL_kRSA|SSL_aRSA)
-+#define SSL_kRSA        0x00000001L
-+#define SSL_aRSA        0x00000002L
-+#define SSL_aDSA        0x00000004L
-+#define SSL_DSA         SSL_aDSA
-+#define SSL_eNULL       0x00000008L
-+#define SSL_DES         0x00000010L
-+#define SSL_3DES        0x00000020L
-+#define SSL_RC4         0x00000040L
-+#define SSL_RC2         0x00000080L
-+#define SSL_AES128      0x00000100L
-+#define SSL_AES256      0x00000200L
-+#define SSL_MD5         0x00000400L
-+#define SSL_SHA1        0x00000800L
-+#define SSL_kEDH        0x00001000L
-+#define SSL_CAMELLIA128 0x00002000L
-+#define SSL_CAMELLIA256 0x00004000L
-+#define SSL_SEED        0x00008000L
-+#define SSL_kECDH       0x00010000L
-+#define SSL_kECDHE      0x00020000L
-+#define SSL_aECDSA      0x00040000L
-+#define SSL_SHA256      0x00080000L
-+#define SSL_SHA384      0x00100000L
-+#define SSL_kEECDH      0x00200000L
-+#define SSL_AESGCM      0x00400000L
-+#define SSL_AEAD        0x00800000L
-+#define SSL_aPSK        0x01000000L
-+#define SSL_CHACHA20POLY1305 0x02000000L
-+
-+/* cipher attributes non-unique - do not use for definitions */
-+#define SSL_RSA         0x00000001L
-+#define SSL_AES         0x00000002L
-+#define SSL_CAMELLIA    0x00000004L
-+#define SSL_ECDH        0x00000008L
- 
- /* cipher strength */
- #define SSL_NULL      0x00000001L
-@@ -240,10 +257,15 @@ typedef struct {
- #define SSL_MEDIUM    0x00000010L
- #define SSL_HIGH      0x00000020L
- 
-+/* cipher strengths non-unique - do not use for definitions */
-+#define SSL_EXPORT    0x00000001L
-+
- #define SSL2  0x00000001L
- #define SSL3  0x00000002L
- /* OpenSSL treats SSL3 and TLSv1 the same */
- #define TLS1  SSL3
-+#define TLS1_2 0x00000004L
-+#define TLS1_3 0x00000008L
- 
- /* Cipher translation */
- static cipher_properties ciphers_def[] = {
---- openldap-2.4.40/include/ldap.h	2014-09-19 03:48:49.000000000 +0200
-+++ openldap-2.4.40/include/ldap.h	2014-11-14 09:25:54.560801030 +0100
-@@ -176,6 +176,7 @@ LDAP_BEGIN_DECL
- #define LDAP_OPT_X_TLS_PROTOCOL_TLS1_0		((3 << 8) + 1)
- #define LDAP_OPT_X_TLS_PROTOCOL_TLS1_1		((3 << 8) + 2)
- #define LDAP_OPT_X_TLS_PROTOCOL_TLS1_2		((3 << 8) + 3)
-+#define LDAP_OPT_X_TLS_PROTOCOL_TLS1_3		((3 << 8) + 4)
- 
- /* OpenLDAP SASL options */
- #define LDAP_OPT_X_SASL_MECH			0x6100

openldap-nss-ciphers-definitions.patch

@@ -1,139 +0,0 @@
-Update MozNSS definitions of ciphers
-
-Author: Matus Honek <mhonek@redhat.com>
-PreviousAuthor: Jan Vcelak <jvcelak@redhat.com>
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -268,29 +268,109 @@ typedef struct {
- 
- /* Cipher translation */
- static cipher_properties ciphers_def[] = {
--	/* SSL 2 ciphers */
--	{"DES-CBC3-MD5", SSL_EN_DES_192_EDE3_CBC_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_MD5, SSL2, 168, 168, SSL_HIGH, SSL_ALLOWED},
--	{"RC2-CBC-MD5", SSL_EN_RC2_128_CBC_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5, SSL2, 128, 128, SSL_MEDIUM, SSL_ALLOWED},
--	{"RC4-MD5", SSL_EN_RC4_128_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5, SSL2, 128, 128, SSL_MEDIUM, SSL_ALLOWED},
--	{"DES-CBC-MD5", SSL_EN_DES_64_CBC_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_DES|SSL_MD5, SSL2, 56, 56, SSL_LOW, SSL_ALLOWED},
--	{"EXP-RC2-CBC-MD5", SSL_EN_RC2_128_CBC_EXPORT40_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5, SSL2, 40, 128, SSL_EXPORT40, SSL_ALLOWED},
--	{"EXP-RC4-MD5", SSL_EN_RC4_128_EXPORT40_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5, SSL2, 40, 128, SSL_EXPORT40, SSL_ALLOWED},
--
--	/* SSL3 ciphers */
--	{"RC4-MD5", SSL_RSA_WITH_RC4_128_MD5, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5, SSL3, 128, 128, SSL_MEDIUM, SSL_ALLOWED},
--	{"RC4-SHA", SSL_RSA_WITH_RC4_128_SHA, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA1, SSL3, 128, 128, SSL_MEDIUM, SSL_ALLOWED},
--	{"DES-CBC3-SHA", SSL_RSA_WITH_3DES_EDE_CBC_SHA, SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_SHA1, SSL3, 168, 168, SSL_HIGH, SSL_ALLOWED},
--	{"DES-CBC-SHA", SSL_RSA_WITH_DES_CBC_SHA, SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1, SSL3, 56, 56, SSL_LOW, SSL_ALLOWED},
--	{"EXP-RC4-MD5", SSL_RSA_EXPORT_WITH_RC4_40_MD5, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5, SSL3, 40, 128, SSL_EXPORT40, SSL_ALLOWED},
--	{"EXP-RC2-CBC-MD5", SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5, SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5, SSL3, 0, 0, SSL_EXPORT40, SSL_ALLOWED},
--	{"NULL-MD5", SSL_RSA_WITH_NULL_MD5, SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_MD5, SSL3, 0, 0, SSL_NULL, SSL_NOT_ALLOWED},
--	{"NULL-SHA", SSL_RSA_WITH_NULL_SHA, SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_SHA1, SSL3, 0, 0, SSL_NULL, SSL_NOT_ALLOWED},
-+
-+	/* SSLv2 ciphers */
-+	{"DES-CBC-MD5",     SSL_EN_DES_64_CBC_WITH_MD5,           SSL_kRSA|SSL_aRSA|SSL_DES|SSL_MD5,  SSL2, SSL_LOW},
-+	{"DES-CBC3-MD5",    SSL_EN_DES_192_EDE3_CBC_WITH_MD5,     SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_MD5, SSL2, SSL_HIGH},
-+	{"RC2-CBC-MD5",     SSL_EN_RC2_128_CBC_WITH_MD5,          SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5,  SSL2, SSL_MEDIUM},
-+	{"RC4-MD5",         SSL_EN_RC4_128_WITH_MD5,              SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5,  SSL2, SSL_MEDIUM},
-+	{"EXP-RC2-CBC-MD5", SSL_EN_RC2_128_CBC_EXPORT40_WITH_MD5, SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5,  SSL2, SSL_EXPORT40},
-+	{"EXP-RC4-MD5",     SSL_EN_RC4_128_EXPORT40_WITH_MD5,     SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5,  SSL2, SSL_EXPORT40},
-+
-+	/* SSLv3 ciphers */
-+	{"NULL-MD5",             TLS_RSA_WITH_NULL_MD5,              SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_MD5,  SSL3, SSL_NULL},      /* SSL_RSA_WITH_NULL_MD5 */
-+	{"NULL-SHA",             TLS_RSA_WITH_NULL_SHA,              SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_SHA1, SSL3, SSL_NULL},	 /* SSL_RSA_WITH_NULL_SHA */
-+	{"DES-CBC-SHA",          TLS_RSA_WITH_DES_CBC_SHA,           SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1,   SSL3, SSL_LOW},	 /* SSL_RSA_WITH_DES_CBC_SHA */
-+	{"DES-CBC3-SHA",         TLS_RSA_WITH_3DES_EDE_CBC_SHA,      SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_SHA1,  SSL3, SSL_HIGH},	 /* SSL_RSA_WITH_3DES_EDE_CBC_SHA */
-+	{"RC4-MD5",              TLS_RSA_WITH_RC4_128_MD5,           SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5,    SSL3, SSL_MEDIUM},	 /* SSL_RSA_WITH_RC4_128_MD5 */
-+	{"RC4-SHA",              TLS_RSA_WITH_RC4_128_SHA,           SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA1,   SSL3, SSL_MEDIUM},	 /* SSL_RSA_WITH_RC4_128_SHA */
-+	{"EXP-RC2-CBC-MD5",      TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5, SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5,    SSL3, SSL_EXPORT40},	 /* SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5 */
-+	{"EXP-RC4-MD5",          TLS_RSA_EXPORT_WITH_RC4_40_MD5,     SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5,    SSL3, SSL_EXPORT40},	 /* SSL_RSA_EXPORT_WITH_RC4_40_MD5 */
-+	{"EDH-RSA-DES-CBC-SHA",  TLS_DHE_RSA_WITH_DES_CBC_SHA,       SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1,   SSL3, SSL_LOW},	 /* SSL_DHE_RSA_WITH_DES_CBC_SHA */
-+	{"EDH-RSA-DES-CBC3-SHA", TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,  SSL_kEDH|SSL_aRSA|SSL_3DES|SSL_SHA1,  SSL3, SSL_HIGH},	 /* SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA */
-+	{"EDH-DSS-DES-CBC-SHA",  TLS_DHE_DSS_WITH_DES_CBC_SHA,       SSL_kEDH|SSL_aDSA|SSL_DES|SSL_SHA1,   SSL3, SSL_LOW},	 /* SSL_DHE_DSS_WITH_DES_CBC_SHA */
-+	{"EDH-DSS-DES-CBC3-SHA", TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,  SSL_kEDH|SSL_aDSA|SSL_3DES|SSL_SHA1,  SSL3, SSL_HIGH},	 /* SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA */
- 
- 	/* TLSv1 ciphers */
--	{"EXP1024-DES-CBC-SHA", TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA, SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA, TLS1, 56, 56, SSL_EXPORT56, SSL_ALLOWED},
--	{"EXP1024-RC4-SHA", TLS_RSA_EXPORT1024_WITH_RC4_56_SHA, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA, TLS1, 56, 56, SSL_EXPORT56, SSL_ALLOWED},
--	{"AES128-SHA", TLS_RSA_WITH_AES_128_CBC_SHA, SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA, TLS1, 128, 128, SSL_HIGH, SSL_ALLOWED},
--	{"AES256-SHA", TLS_RSA_WITH_AES_256_CBC_SHA, SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA, TLS1, 256, 256, SSL_HIGH, SSL_ALLOWED},
-+	{"EXP1024-DES-CBC-SHA",      TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA,   SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1,         TLS1, SSL_EXPORT56},
-+	{"EXP1024-RC4-SHA",          TLS_RSA_EXPORT1024_WITH_RC4_56_SHA,    SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA1,         TLS1, SSL_EXPORT56},
-+	{"SEED-SHA",                 TLS_RSA_WITH_SEED_CBC_SHA,             SSL_kRSA|SSL_aRSA|SSL_SEED|SSL_SHA1,        TLS1, SSL_MEDIUM},
-+	{"AES128-SHA",               TLS_RSA_WITH_AES_128_CBC_SHA,          SSL_kRSA|SSL_aRSA|SSL_AES128|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"AES256-SHA",               TLS_RSA_WITH_AES_256_CBC_SHA,          SSL_kRSA|SSL_aRSA|SSL_AES256|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"CAMELLIA256-SHA",          TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,     SSL_kRSA|SSL_aRSA|SSL_CAMELLIA256|SSL_SHA1, TLS1, SSL_HIGH},
-+	{"CAMELLIA128-SHA",          TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,     SSL_kRSA|SSL_aRSA|SSL_CAMELLIA128|SSL_SHA1, TLS1, SSL_HIGH},
-+	{"DHE-RSA-AES128-SHA",       TLS_DHE_RSA_WITH_AES_128_CBC_SHA,      SSL_kEDH|SSL_aRSA|SSL_AES128|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"DHE-RSA-AES256-SHA",       TLS_DHE_RSA_WITH_AES_256_CBC_SHA,      SSL_kEDH|SSL_aRSA|SSL_AES256|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"DHE-RSA-CAMELLIA128-SHA",  TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, SSL_kEDH|SSL_aRSA|SSL_CAMELLIA128|SSL_SHA1, TLS1, SSL_HIGH},
-+	{"DHE-RSA-CAMELLIA256-SHA",  TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, SSL_kEDH|SSL_aRSA|SSL_CAMELLIA256|SSL_SHA1, TLS1, SSL_HIGH},
-+	{"DHE-DSS-RC4-SHA",          TLS_DHE_DSS_WITH_RC4_128_SHA,          SSL_kEDH|SSL_aDSA|SSL_RC4|SSL_SHA1,         TLS1, SSL_MEDIUM},
-+	{"DHE-DSS-AES128-SHA",       TLS_DHE_DSS_WITH_AES_128_CBC_SHA,      SSL_kEDH|SSL_aDSA|SSL_AES128|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"DHE-DSS-AES256-SHA",       TLS_DHE_DSS_WITH_AES_256_CBC_SHA,      SSL_kEDH|SSL_aDSA|SSL_AES256|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"DHE-DSS-CAMELLIA128-SHA",  TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, SSL_kEDH|SSL_aDSA|SSL_CAMELLIA128|SSL_SHA1, TLS1, SSL_HIGH},
-+	{"DHE-DSS-CAMELLIA256-SHA",  TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, SSL_kEDH|SSL_aDSA|SSL_CAMELLIA256|SSL_SHA1, TLS1, SSL_HIGH},
-+	{"ECDH-RSA-NULL-SHA",        TLS_ECDH_RSA_WITH_NULL_SHA,            SSL_kECDH|SSL_aRSA|SSL_eNULL|SSL_SHA1,      TLS1, SSL_NULL},
-+	{"ECDH-RSA-RC4-SHA",         TLS_ECDH_RSA_WITH_RC4_128_SHA,         SSL_kECDH|SSL_aRSA|SSL_RC4|SSL_SHA1,        TLS1, SSL_MEDIUM},
-+	{"ECDH-RSA-DES-CBC3-SHA",    TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,    SSL_kECDH|SSL_aRSA|SSL_3DES|SSL_SHA1,       TLS1, SSL_HIGH},
-+	{"ECDH-RSA-AES128-SHA",      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,     SSL_kECDH|SSL_aRSA|SSL_AES128|SSL_SHA1,     TLS1, SSL_HIGH},
-+	{"ECDH-RSA-AES256-SHA",      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,     SSL_kECDH|SSL_aRSA|SSL_AES256|SSL_SHA1,     TLS1, SSL_HIGH},
-+	{"ECDH-ECDSA-NULL-SHA",      TLS_ECDH_ECDSA_WITH_NULL_SHA,          SSL_kECDH|SSL_aECDSA|SSL_eNULL|SSL_SHA1,    TLS1, SSL_NULL},
-+	{"ECDH-ECDSA-RC4-SHA",       TLS_ECDH_ECDSA_WITH_RC4_128_SHA,       SSL_kECDH|SSL_aECDSA|SSL_RC4|SSL_SHA1,      TLS1, SSL_MEDIUM},
-+	{"ECDH-ECDSA-DES-CBC3-SHA",  TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,  SSL_kECDH|SSL_aECDSA|SSL_3DES|SSL_SHA1,     TLS1, SSL_HIGH},
-+	{"ECDH-ECDSA-AES128-SHA",    TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,   SSL_kECDH|SSL_aECDSA|SSL_AES128|SSL_SHA1,   TLS1, SSL_HIGH},
-+	{"ECDH-ECDSA-AES256-SHA",    TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,   SSL_kECDH|SSL_aECDSA|SSL_AES256|SSL_SHA1,   TLS1, SSL_HIGH},
-+	{"ECDHE-RSA-NULL-SHA",       TLS_ECDHE_RSA_WITH_NULL_SHA,           SSL_kECDHE|SSL_aRSA|SSL_eNULL|SSL_SHA1,     TLS1, SSL_NULL},
-+	{"ECDHE-RSA-RC4-SHA",        TLS_ECDHE_RSA_WITH_RC4_128_SHA,        SSL_kECDHE|SSL_aRSA|SSL_RC4|SSL_SHA1,       TLS1, SSL_MEDIUM},
-+	{"ECDHE-RSA-DES-CBC3-SHA",   TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,   SSL_kECDHE|SSL_aRSA|SSL_3DES|SSL_SHA1,      TLS1, SSL_HIGH},
-+	{"ECDHE-RSA-AES128-SHA",     TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,    SSL_kECDHE|SSL_aRSA|SSL_AES128|SSL_SHA1,    TLS1, SSL_HIGH},
-+	{"ECDHE-RSA-AES256-SHA",     TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,    SSL_kECDHE|SSL_aRSA|SSL_AES256|SSL_SHA1,    TLS1, SSL_HIGH},
-+	{"ECDHE-ECDSA-NULL-SHA",     TLS_ECDHE_ECDSA_WITH_NULL_SHA,         SSL_kECDHE|SSL_aECDSA|SSL_eNULL|SSL_SHA1,   TLS1, SSL_NULL},
-+	{"ECDHE-ECDSA-RC4-SHA",      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,      SSL_kECDHE|SSL_aECDSA|SSL_RC4|SSL_SHA1,     TLS1, SSL_MEDIUM},
-+	{"ECDHE-ECDSA-DES-CBC3-SHA", TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, SSL_kECDHE|SSL_aECDSA|SSL_3DES|SSL_SHA1,    TLS1, SSL_HIGH},
-+	{"ECDHE-ECDSA-AES128-SHA",   TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,  SSL_kECDHE|SSL_aECDSA|SSL_AES128|SSL_SHA1,  TLS1, SSL_HIGH},
-+	{"ECDHE-ECDSA-AES256-SHA",   TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,  SSL_kECDHE|SSL_aECDSA|SSL_AES256|SSL_SHA1,  TLS1, SSL_HIGH},
-+
-+	// Ciphers commented out are not in NSS yet.
-+
-+	{"NULL-SHA256",              TLS_RSA_WITH_NULL_SHA256,              SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_SHA256,     TLS1_2, SSL_NULL},
-+	{"AES128-SHA256",            TLS_RSA_WITH_AES_128_CBC_SHA256,       SSL_kRSA|SSL_aRSA|SSL_AES128|SSL_SHA256,    TLS1_2, SSL_HIGH},
-+	{"AES256-SHA256",            TLS_RSA_WITH_AES_256_CBC_SHA256,       SSL_kRSA|SSL_aRSA|SSL_AES256|SSL_SHA256,    TLS1_2, SSL_HIGH},
-+	{"AES128-GCM-SHA256",        TLS_RSA_WITH_AES_128_GCM_SHA256,       SSL_kRSA|SSL_aRSA|SSL_AES128|SSL_AESGCM|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+	{"AES256-GCM-SHA384",        0x009d /* TLS_RSA_WITH_AES_256_GCM_SHA384 */,       SSL_kRSA|SSL_aRSA|SSL_AES256|SSL_AESGCM|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+
-+	{"DHE-RSA-AES256-SHA256",     TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, SSL_kEDH|SSL_aRSA|SSL_AES256|SSL_SHA256,            TLS1_2, SSL_HIGH},
-+	{"DHE-RSA-AES128-SHA256",     TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, SSL_kEDH|SSL_aRSA|SSL_AES128|SSL_SHA256,            TLS1_2, SSL_HIGH},
-+	{"DHE-RSA-AES128-GCM-SHA256", TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, SSL_kEDH|SSL_aRSA|SSL_AES128|SSL_AESGCM|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+	{"DHE-RSA-AES256-GCM-SHA384", 0x009f /* TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 */, SSL_kEDH|SSL_aRSA|SSL_AES256|SSL_AESGCM|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+
-+	{"DHE-DSS-AES128-SHA256",     TLS_DHE_DSS_WITH_AES_128_CBC_SHA256, SSL_kEDH|SSL_aDSA|SSL_AES128|SSL_SHA256,          TLS1_2, SSL_HIGH},
-+	{"DHE-DSS-AES256-SHA256",     TLS_DHE_DSS_WITH_AES_256_CBC_SHA256, SSL_kEDH|SSL_aDSA|SSL_AES256|SSL_SHA256,          TLS1_2, SSL_HIGH},
-+	{"DHE-DSS-AES128-GCM-SHA256", TLS_DHE_DSS_WITH_AES_128_GCM_SHA256, SSL_kEDH|SSL_aDSA|SSL_AES128|SSL_AESGCM|SSL_AEAD, TLS1_2, SSL_HIGH},
-+	{"DHE-DSS-AES128-GCM-SHA256", 0x00a3 /* TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 */, SSL_kEDH|SSL_aDSA|SSL_AES256|SSL_AESGCM|SSL_AEAD, TLS1_2, SSL_HIGH},
-+	//{"DHE-DSS-AES128-GCM-SHA384", TLS_DHE_DSS_WITH_AES_128_GCM_SHA384, SSL_kEDH|SSL_aDSA|SSL_AES128|SSL_AESGCM|SSL_AEAD, TLS1_2, SSL_HIGH},
-+
-+	{"ECDHE-ECDSA-AES128-SHA256",     TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, SSL_kECDHE|SSL_aECDSA|SSL_AES128|SSL_SHA256,          TLS1_2, SSL_HIGH},
-+	{"ECDHE-RSA-AES128-SHA256",       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,   SSL_kECDHE|SSL_aRSA|SSL_AES128|SSL_SHA256,            TLS1_2, SSL_HIGH},
-+	{"ECDHE-ECDSA-AES128-GCM-SHA256", TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, SSL_kECDHE|SSL_aECDSA|SSL_AES128|SSL_AESGCM|SSL_AEAD, TLS1_2, SSL_HIGH},
-+	{"ECDHE-RSA-AES128-GCM-SHA256",   TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,   SSL_kECDHE|SSL_aRSA|SSL_AES128|SSL_AESGCM|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+	{"ECDHE-ECDSA-AES256-GCM-SHA384", 0xc02c /* TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 */, SSL_kECDHE|SSL_aECDSA|SSL_AES256|SSL_AESGCM|SSL_AEAD, TLS1_2, SSL_HIGH},
-+	{"ECDHE-RSA-AES256-GCM-SHA384",   0xc030 /* TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 */,   SSL_kECDHE|SSL_aRSA|SSL_AES256|SSL_AESGCM|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+	{"ECDHE-ECDSA-AES256-SHA384",     0xc024 /* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 */, SSL_kECDHE|SSL_aECDSA|SSL_AES256|SSL_SHA384,          TLS1_2, SSL_HIGH},
-+	{"ECDHE-RSA-AES256-SHA384",       0xc028 /* TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 */,   SSL_kECDHE|SSL_aRSA|SSL_AES256|SSL_SHA384,            TLS1_2, SSL_HIGH},
-+
-+	{"ECDHE-PSK-AES128-GCM-SHA256",   0xd001 /* TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256 */,         SSL_kECDHE|SSL_aPSK|SSL_AES128|SSL_AESGCM|SSL_AEAD,  TLS1_2, SSL_HIGH},
-+	{"ECDHE-PSK-CHACHA20-POLY1305",   0xccac /* TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 */,   SSL_kECDHE|SSL_aPSK|SSL_CHACHA20POLY1305|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+	{"ECDHE-PSK-AES256-GCM-SHA384",   0xd002 /* TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384 */,         SSL_kECDHE|SSL_aPSK|SSL_AES256|SSL_AESGCM|SSL_AEAD,  TLS1_2, SSL_HIGH},
-+	{"",                              0x00aa /* TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 */,           SSL_kEDH|SSL_aPSK|SSL_AES128|SSL_AESGCM|SSL_AEAD,    TLS1_2, SSL_HIGH},
-+	{"",                              0xccad /* TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256 */,     SSL_kEDH|SSL_aPSK|SSL_CHACHA20POLY1305|SSL_AEAD,     TLS1_2, SSL_HIGH},
-+	{"",                              0x00ab /* TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 */,           SSL_kEDH|SSL_aPSK|SSL_AES256|SSL_AESGCM|SSL_AEAD,    TLS1_2, SSL_HIGH},
-+	//{"ECDHE-ECDSA-CHACHA20-POLY1305", 0xcca9 /* TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 */, SSL_kECDHE|SSL_aECDSA|SSL_CHACHA20POLY1305|SSL_AEAD, TLS1_2, SSL_HIGH},
-+	//{"ECDHE-RSA-CHACHA20-POLY1305",   0xcca8 /* TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 */,   SSL_kECDHE|SSL_aRSA|SSL_CHACHA20POLY1305|SSL_AEAD,   TLS1_2, SSL_HIGH},
-+	//{"DHE-RSA-CHACHA20-POLY1305",     0xccaa /* TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 */,     SSL_kEDH|SSL_aRSA|SSL_CHACHA20POLY1305|SSL_AEAD,     TLS1_2, SSL_HIGH},
-+
-+	// TLSv1.3
-+	{"TLS13-AES-128-GCM-SHA256",	0x1301 /* TLS_AES_128_GCM_SHA256 */,	SSL_AES128|SSL_AESGCM|SSL_AEAD,	TLS1_3, SSL_HIGH},
-+	{"TLS13-AES-256-GCM-SHA384",	0x1302 /* TLS_AES_256_GCM_SHA384 */,	SSL_AES256|SSL_AESGCM|SSL_AEAD,	TLS1_3, SSL_HIGH},
-+	{"TLS13-CHACHA20-POLY1305-SHA256",     0x1303 /* TLS_CHACHA20_POLY1305_SHA256 */,	SSL_CHACHA20POLY1305|SSL_AEAD,	TLS1_3, SSL_HIGH},
- };
- 
- #define ciphernum (sizeof(ciphers_def)/sizeof(cipher_properties))

openldap-nss-ciphers-parsing.patch

@@ -1,196 +0,0 @@
-Update MozNSS OpenSSL-like parsing code
-
-Author: Matus Honek <mhonek@redhat.com>
-PreviousAuthor: Jan Vcelak <jvcelak@redhat.com>
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -617,10 +617,12 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 		while ((*cipher) && (isspace(*cipher)))
- 			++cipher;
- 
--		action = 1;
- 		switch(*cipher) {
--		case '+': /* Add something */
--			action = 1;
-+		case '+': /* Do nothig. NSS does not support ordering. */
-+			Debug( LDAP_DEBUG_ARGS,
-+			       "TLS: warning: parsing cipher string: ordering is not supported by NSS.\n",
-+			       0, 0, 0 );
-+			action = 2;
- 			cipher++;
- 			break;
- 		case '-': /* Subtract something */
-@@ -631,8 +633,8 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 			action = -1;
- 			cipher++;
- 			break;
--		default:
--			/* do nothing */
-+		default: /* Add something */
-+			action = 1;
- 			break;
- 		}
- 
-@@ -666,7 +668,10 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 			}
- 		} else {
- 			int mask = 0;
-+			int multi_mask = 0;
-+			int negative_mask = 0;
- 			int strength = 0;
-+			int multi_strength = 0;
- 			int protocol = 0;
- 			char *c;
- 
-@@ -677,12 +682,21 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 					*c++ = '\0';
- 				}
- 
--				if (!strcmp(cipher, "RSA")) {
--					mask |= SSL_RSA;
-+				if ((!strcmp(cipher, "RSA")) || (!strcmp(cipher, "kRSA"))) {
-+					mask |= SSL_kRSA;
-+				} else if (!strcmp(cipher, "aRSA")) {
-+					mask |= SSL_aRSA;
-+					negative_mask |= SSL_kECDH;
- 				} else if ((!strcmp(cipher, "NULL")) || (!strcmp(cipher, "eNULL"))) {
- 					mask |= SSL_eNULL;
-+				} else if (!strcmp(cipher, "AES128")) {
-+					mask |= SSL_AES128;
-+				} else if (!strcmp(cipher, "AES256")) {
-+					mask |= SSL_AES256;
-+				} else if (!strcmp(cipher, "AESGCM")) {
-+					mask |= SSL_AESGCM;
- 				} else if (!strcmp(cipher, "AES")) {
--					mask |= SSL_AES;
-+					multi_mask |= SSL_AES;
- 				} else if (!strcmp(cipher, "3DES")) {
- 					mask |= SSL_3DES;
- 				} else if (!strcmp(cipher, "DES")) {
-@@ -693,26 +707,69 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 					mask |= SSL_RC2;
- 				} else if (!strcmp(cipher, "MD5")) {
- 					mask |= SSL_MD5;
-+				} else if (!strcmp(cipher, "SHA256")) {
-+					mask |= SSL_SHA256;
-+				} else if (!strcmp(cipher, "SHA384")) {
-+					mask |= SSL_SHA384;
- 				} else if ((!strcmp(cipher, "SHA")) || (!strcmp(cipher, "SHA1"))) {
- 					mask |= SSL_SHA1;
-+				} else if ((!strcmp(cipher, "EDH")) || (!strcmp(cipher, "DH"))) {
-+					mask |= SSL_kEDH;
-+				} else if ((!strcmp(cipher, "DSS")) || (!strcmp(cipher, "aDSS"))) {
-+					mask |= SSL_aDSA;
-+				} else if (!strcmp(cipher, "CAMELLIA128")) {
-+					mask |= SSL_CAMELLIA128;
-+				} else if (!strcmp(cipher, "CAMELLIA256")) {
-+					mask |= SSL_CAMELLIA256;
-+				} else if (!strcmp(cipher, "CAMELLIA")) {
-+					multi_mask |= SSL_CAMELLIA;
-+				} else if (!strcmp(cipher, "SEED")) {
-+					mask |= SSL_SEED;
-+				} else if (!strcmp(cipher, "kECDHe")) {
-+					mask |= SSL_kECDH|SSL_aECDSA;
-+				} else if (!strcmp(cipher, "kECDHr")) {
-+					mask |= SSL_kECDH|SSL_aRSA;
-+				} else if (!strcmp(cipher, "kECDH")) {
-+					mask |= SSL_kECDH;
-+				} else if (!strcmp(cipher, "aECDH")) {
-+					mask |= SSL_kECDH;
-+				} else if (!strcmp(cipher, "EECDH")) {
-+					mask |= SSL_kECDHE;
-+				} else if (!strcmp(cipher, "kEECDH")) {
-+					mask |= SSL_kECDHE;
-+				} else if (!strcmp(cipher, "ECDHE")) {
-+					mask |= SSL_kECDHE;
-+				} else if (!strcmp(cipher, "ECDH")) {
-+					multi_mask |= SSL_ECDH;
-+				} else if ((!strcmp(cipher, "ECDSA")) || (!strcmp(cipher, "aECDSA"))) {
-+					mask |= SSL_aECDSA;
-+					negative_mask |= SSL_kECDH;
-+				} else if (!strcmp(cipher, "PSK")) {
-+					mask |= SSL_aPSK;
-+				} else if (!strcmp(cipher, "CHACHA20POLY1305")) {
-+					mask |= SSL_CHACHA20POLY1305;
- 				} else if (!strcmp(cipher, "SSLv2")) {
- 					protocol |= SSL2;
- 				} else if (!strcmp(cipher, "SSLv3")) {
- 					protocol |= SSL3;
- 				} else if (!strcmp(cipher, "TLSv1")) {
- 					protocol |= TLS1;
-+				} else if (!strcmp(cipher, "TLSv1.2")) {
-+					protocol |= TLS1_2;
-+				} else if (!strcmp(cipher, "TLSv1.3")) {
-+					protocol |= TLS1_3;
- 				} else if (!strcmp(cipher, "HIGH")) {
- 					strength |= SSL_HIGH;
- 				} else if (!strcmp(cipher, "MEDIUM")) {
- 					strength |= SSL_MEDIUM;
- 				} else if (!strcmp(cipher, "LOW")) {
- 					strength |= SSL_LOW;
--				} else if ((!strcmp(cipher, "EXPORT")) || (!strcmp(cipher, "EXP"))) {
--					strength |= SSL_EXPORT40|SSL_EXPORT56;
- 				} else if (!strcmp(cipher, "EXPORT40")) {
- 					strength |= SSL_EXPORT40;
- 				} else if (!strcmp(cipher, "EXPORT56")) {
- 					strength |= SSL_EXPORT56;
-+				} else if ((!strcmp(cipher, "EXPORT")) || (!strcmp(cipher, "EXP"))) {
-+					multi_strength |= SSL_EXPORT;
- 				}
- 
- 				if (c)
-@@ -720,23 +775,39 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 
- 			} /* while */
- 
-+			/* NSS does not support ordering */
-+			if (action == 2)
-+			  continue;
-+
- 			/* If we have a mask, apply it. If not then perhaps they provided
- 			 * a specific cipher to enable.
-+			 * if more than one mask is provided then AND logic applies (to match openssl)
- 			 */
--			if (mask || strength || protocol) {
-+			if (mask || negative_mask || multi_mask || strength || multi_strength || protocol) {
- 				for (i=0; i<ciphernum; i++) {
--					if (((ciphers_def[i].attr & mask) ||
--						 (ciphers_def[i].strength & strength) ||
--						 (ciphers_def[i].version & protocol)) &&
--						(cipher_list[i] != -1)) {
--						/* Enable the NULL ciphers only if explicity
--						 * requested */
--						if (ciphers_def[i].attr & SSL_eNULL) {
--							if (mask & SSL_eNULL)
--								cipher_list[i] = action;
--						} else
--							cipher_list[i] = action;
--					}
-+					if ( cipher_list[i] == -1 )
-+						continue;
-+					if ( mask != (ciphers_def[i].attr & mask) )
-+						continue;
-+					if ( strength != (ciphers_def[i].strength & strength) )
-+						continue;
-+					if ( protocol != (ciphers_def[i].version & protocol) )
-+						continue;
-+					if ((multi_mask & SSL_AES) &&
-+					    !(ciphers_def[i].attr & (SSL_AES128|SSL_AES256|SSL_AESGCM)))
-+						continue;
-+					if ((multi_mask & SSL_ECDH) &&
-+					    !(ciphers_def[i].attr & (SSL_kECDH|SSL_kECDHE)))
-+						continue;
-+					if ((multi_mask & SSL_CAMELLIA) &&
-+					    !(ciphers_def[i].attr & (SSL_CAMELLIA128|SSL_CAMELLIA256)))
-+						continue;
-+					if ((multi_strength & SSL_EXPORT) &&
-+					    !(ciphers_def[i].strength & (SSL_EXPORT40|SSL_EXPORT56)))
-+						continue;
-+					if ( negative_mask & ciphers_def[i].attr )
-+						continue;
-+					cipher_list[i] = action;
- 				}
- 			} else {
- 				for (i=0; i<ciphernum; i++) {

openldap-nss-ciphers-use-nss-defaults.patch

@@ -1,27 +0,0 @@
-Use what NSS considers default for DEFAULT cipher string.
-
-Author: Matus Honek <mhonek@redhat.com>
-Resolves: #1387868
-Backports: #1245279 #1300701
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -645,7 +645,16 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum])
- 			}
- 		} else if (!strcmp(cipher, "DEFAULT")) {
- 			for (i=0; i<ciphernum; i++) {
--				cipher_list[i] = ciphers_def[i].enabled == SSL_ALLOWED ? 1 : 0;
-+				PRBool enabled;
-+				if (SSL_CipherPrefGetDefault(ciphers_def[i].num, &enabled) == SECSuccess) {
-+					if (!(ciphers_def[i].attr & SSL_eNULL)) {
-+						cipher_list[i] = enabled == SSL_ALLOWED ? 1 : 0;
-+					} else {
-+						cipher_list[i] = -1;
-+					}
-+				} else {
-+					cipher_list[i] = -1;
-+				}
- 			}
- 		} else {
- 			int mask = 0;

openldap-nss-default-cipher-suite-always-selected.patch

@@ -1,34 +0,0 @@
-MozNSS: default cipher suite always selected
-
-Author: Tim Strobell <tim.strobell.ctr@nrl.navy.mil>
-Upstream ITS: #7285
-Upstream commit: 2c2bb2e7aee1b2167f383a8344985a1cf66aff3f
-Resolves: #828790
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 23d843c..b608551 100644
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -2218,12 +2218,13 @@ tlsm_deferred_ctx_init( void *arg )
- 		return -1;
- 	}
- 
-- 	if ( lt->lt_ciphersuite &&
--	     tlsm_parse_ciphers( ctx, lt->lt_ciphersuite )) {
-- 		Debug( LDAP_DEBUG_ANY,
--		       "TLS: could not set cipher list %s.\n",
--		       lt->lt_ciphersuite, 0, 0 );
--		return -1;
-+	if ( lt->lt_ciphersuite ) {
-+		if ( tlsm_parse_ciphers( ctx, lt->lt_ciphersuite ) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "TLS: could not set cipher list %s.\n",
-+			       lt->lt_ciphersuite, 0, 0 );
-+			return -1;
-+		}
- 	} else if ( tlsm_parse_ciphers( ctx, "DEFAULT" ) ) {
-  		Debug( LDAP_DEBUG_ANY,
- 		       "TLS: could not set cipher list DEFAULT.\n",
--- 
-1.7.10.4
-

openldap-nss-ignore-certdb-type-prefix.patch

@@ -1,47 +0,0 @@
-MozNSS: ignore certdb database type prefix when checking existence of the directory
-
-If the certdb is specified including the database type prefix (e.g.
-sql:, dbm:), the prefix has to be ignored when checking the
-certificate directory existence.
-
-Author: Jan Vcelak <jvcelak@redhat.com>
-Upstream ITS: #7388
-Resolves: #857373
-
----
- libraries/libldap/tls_m.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 49a3f8f..5ee21a2 100644
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -1633,6 +1633,7 @@ tlsm_get_certdb_prefix( const char *certdir, char **realcertdir, char **prefix )
- {
- 	char sep = PR_GetDirectorySeparator();
- 	char *ptr = NULL;
-+	char *chkpath = NULL;
- 	struct PRFileInfo prfi;
- 	PRStatus prc;
- 
-@@ -1643,8 +1644,16 @@ tlsm_get_certdb_prefix( const char *certdir, char **realcertdir, char **prefix )
- 		return;
- 	}
- 
--	prc = PR_GetFileInfo( certdir, &prfi );
-+	/* ignore database type prefix (e.g. sql:, dbm:) if provided */
-+	chkpath = strchr( certdir, ':' );
-+	if ( chkpath != NULL ) {
-+		chkpath += 1;
-+	} else {
-+		chkpath = certdir;
-+	}
-+
- 	/* if certdir exists (file or directory) then it cannot specify a prefix */
-+	prc = PR_GetFileInfo( chkpath, &prfi );
- 	if ( prc == PR_SUCCESS ) {
- 		return;
- 	}
--- 
-1.7.11.7
-

openldap-nss-pk11-freeslot.patch

@@ -1,23 +0,0 @@
-Resolves: #929357
-
-Upstream commit: 6330d1b87a45b447f33fe8ffd6fbbce9e60bb0ec
-Author: Rich Megginson <rmeggins@redhat.com>
-Date: Thu, 28 Mar 2013 19:05:02 -0600
-Modified by: Jan Synacek <jsynacek@redhat.com>
-
-This patch has been re-diffed so it clearly applies to OpenLDAP 2.4.39.
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 072d41d..c59d303 100644
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -2151,6 +2151,8 @@
- 				   "TLS: could not close certdb slot - error %d:%s.\n",
- 				   errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ), 0 );
- 		}
-+		PK11_FreeSlot( c->tc_certdb_slot );
-+		c->tc_certdb_slot = NULL;
- 	}
- 	if ( c->tc_pin_file ) {
- 		PL_strfree( c->tc_pin_file );
-

openldap-nss-protocol-version-new-api.patch

@@ -1,71 +0,0 @@
-Implement new API for setting TLS protocol version.
-
-The code being deleted has been misplaced and it's effect has been
-mangled by a code later on. This patch puts the code at the correct
-place and introduces some more logging and error checking.
-
-Author: Matus Honek <mhonek@redhat.com>
-RHBZ: #1375432
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -2421,6 +2411,58 @@ tlsm_deferred_ctx_init( void *arg )
- 		       0, 0, 0 );
- 		return -1;
- 	}
-+	if ( lt->lt_protocol_min >= LDAP_OPT_X_TLS_PROTOCOL_SSL3 ) {
-+		SSLVersionRange supported_range, default_range, selected_range;
-+		if ( SECSuccess != SSL_VersionRangeGetSupported(ssl_variant_stream, &supported_range) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "TLS: error: could not get SSL supported version range (SSL_VersionRangeGetSupported).\n",
-+			       0, 0, 0 );
-+			return -1;
-+		} else {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "TLS: info: SSL supported protocol version range is (%#04x, %#04x) (SSL_VersionRangeGetSupported).\n",
-+			       supported_range.min, supported_range.max, 0);
-+		}
-+		if ( SECSuccess != SSL_VersionRangeGetDefault(ssl_variant_stream, &default_range) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "TLS: error: could not get SSL default protocol version range (SSL_VersionRangeGetDefault).\n",
-+			       0, 0, 0 );
-+			return -1;
-+		} else {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "TLS: info: SSL default protocol version range is (%#04x, %#04x) (SSL_VersionRangeGetDefault).\n",
-+			       default_range.min, default_range.max, 0);
-+		}
-+		selected_range.min = lt->lt_protocol_min;
-+		selected_range.max = default_range.max;
-+		Debug( LDAP_DEBUG_ANY,
-+		       "TLS: info: TLS configured protocol minimal version is %#04x, the maximal version (the NSS default) is %#04x.\n",
-+		       selected_range.min, selected_range.max, 0);
-+		if ( (selected_range.min > supported_range.max) ||
-+		     (selected_range.max < supported_range.min) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "TLS: error: selected protocol version range out of NSS-supported version range.\n",
-+			       0, 0, 0);
-+			return -1;
-+		} else {
-+			if ( SECSuccess != SSL_VersionRangeSet(ctx->tc_model, &selected_range) ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "TLS: error: could not set protocol version range (SSL_VersionRangeSet).\n",
-+				       0, 0, 0);
-+				return -1;
-+			}
-+			if ( SECSuccess != SSL_VersionRangeGet(ctx->tc_model, &selected_range) ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "TLS: error: could not get protocol version range (SSL_VersionRangeGet).\n",
-+				       0, 0, 0);
-+				return -1;
-+			} else {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "TLS: info: SSL set protocol version range is (%#04x, %#04x) (SSL_VersionRangeGet).\n",
-+				       selected_range.min, selected_range.max, 0);
-+			}
-+		}
-+	}
- 
- 	if ( SECSuccess != SSL_OptionSet( ctx->tc_model, SSL_HANDSHAKE_AS_CLIENT, !ctx->tc_is_server ) ) {
-  		Debug( LDAP_DEBUG_ANY,

openldap-nss-regex-search-hashed-cacert-dir.patch

@@ -1,91 +0,0 @@
-MozNSS: better file name matching for hashed CA  certificate directory
-
-CA certificate files in OpenSSL compatible CACERTDIR were loaded if the file extension was '.0'. However the file name
-should be 8 letters long certificate hash of the certificate subject name, followed by a numeric suffix which is used
-to differentiate between two certificates with the same subject name.
-
-Wit this patch, certificate file names are matched correctly (using regular expressions).
-
-Author: Jan Vcelak <jvcelak@redhat.com>
-Upstream ITS: #7374
-Resolves: #852786
-
-diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 5e49fc5..61d71d4 100644
---- a/libraries/libldap/tls_m.c
-+++ b/libraries/libldap/tls_m.c
-@@ -38,6 +38,7 @@
- #include <ac/unistd.h>
- #include <ac/param.h>
- #include <ac/dirent.h>
-+#include <ac/regex.h>
- 
- #include "ldap-int.h"
- #include "ldap-tls.h"
-@@ -118,9 +119,7 @@ static const PRIOMethods tlsm_PR_methods;
- 
- #define PEM_LIBRARY	"nsspem"
- #define PEM_MODULE	"PEM"
--/* hash files for use with cacertdir have this file name suffix */
--#define PEM_CA_HASH_FILE_SUFFIX	".0"
--#define PEM_CA_HASH_FILE_SUFFIX_LEN 2
-+#define PEM_CA_HASH_FILE_REGEX "^[0-9a-f]{8}\\.[0-9]+$"
- 
- static SECMODModule *pem_module;
- 
-@@ -1541,6 +1540,7 @@ tlsm_init_ca_certs( tlsm_ctx *ctx, const char *cacertfile, const char *cacertdir
- 		PRDir *dir;
- 		PRDirEntry *entry;
- 		PRStatus fistatus = PR_FAILURE;
-+		regex_t hashfile_re;
- 
- 		memset( &fi, 0, sizeof(fi) );
- 		fistatus = PR_GetFileInfo( cacertdir, &fi );
-@@ -1570,20 +1570,30 @@ tlsm_init_ca_certs( tlsm_ctx *ctx, const char *cacertfile, const char *cacertdir
- 			goto done;
- 		}
- 
-+		if ( regcomp( &hashfile_re, PEM_CA_HASH_FILE_REGEX, REG_NOSUB|REG_EXTENDED ) != 0 ) {
-+			Debug( LDAP_DEBUG_ANY, "TLS: cannot compile regex for CA hash files matching\n", 0, 0, 0 );
-+			goto done;
-+		}
-+
- 		do {
- 			entry = PR_ReadDir( dir, PR_SKIP_BOTH | PR_SKIP_HIDDEN );
- 			if ( ( NULL != entry ) && ( NULL != entry->name ) ) {
- 				char *fullpath = NULL;
--				char *ptr;
-+				int match;
- 
--				ptr = PL_strrstr( entry->name, PEM_CA_HASH_FILE_SUFFIX );
--				if ( ( ptr == NULL ) || ( *(ptr + PEM_CA_HASH_FILE_SUFFIX_LEN) != '\0' ) ) {
-+				match = regexec( &hashfile_re, entry->name, 0, NULL, 0 );
-+				if ( match == REG_NOMATCH ) {
- 					Debug( LDAP_DEBUG_TRACE,
--						   "TLS: file %s does not end in [%s] - does not appear to be a CA certificate "
--						   "directory file with a properly hashed file name - skipping.\n",
--						   entry->name, PEM_CA_HASH_FILE_SUFFIX, 0 );
-+						   "TLS: skipping '%s' - filename does not have expected format "
-+						   "(certificate hash with numeric suffix)\n", entry->name, 0, 0 );
-+					continue;
-+				} else if ( match != 0 ) {
-+					Debug( LDAP_DEBUG_ANY,
-+						   "TLS: cannot execute regex for CA hash file matching (%d).\n",
-+						   match, 0, 0 );
- 					continue;
- 				}
-+
- 				fullpath = PR_smprintf( "%s/%s", cacertdir, entry->name );
- 				if ( !tlsm_add_cert_from_file( ctx, fullpath, isca ) ) {
- 					Debug( LDAP_DEBUG_TRACE,
-@@ -1599,6 +1609,7 @@ tlsm_init_ca_certs( tlsm_ctx *ctx, const char *cacertfile, const char *cacertdir
- 				PR_smprintf_free( fullpath );
- 			}
- 		} while ( NULL != entry );
-+		regfree ( &hashfile_re );
- 		PR_CloseDir( dir );
- 	}
- done:
--- 
-1.7.11.4
-

openldap-openssl-manpage-defaultCA.patch

@@ -0,0 +1,51 @@
+Reference default system-wide CA certificates in manpages
+
+OpenSSL, unless explicitly configured, uses system-wide default set of CA
+certificates.
+
+Author: Matus Honek <mhonek@redhat.com>
+
+diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
+index 6084298..3070bb4 100644
+--- a/doc/man/man5/ldap.conf.5
++++ b/doc/man/man5/ldap.conf.5
+@@ -327,6 +327,9 @@ are more options you can specify.  These options are used when an
+ .B ldaps:// URI
+ is selected (by default or otherwise) or when the application
+ negotiates TLS by issuing the LDAP StartTLS operation.
++.LP
++When using OpenSSL, if neither  \fBTLS_CACERT\fP nor \fBTLS_CACERTDIR\fP
++is set, the system-wide default set of CA certificates is used.
+ .TP
+ .B TLS_CACERT <filename>
+ Specifies the file that contains certificates for all of the Certificate
+diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
+index a559b0c..adda87a 100644
+--- a/doc/man/man5/slapd-config.5
++++ b/doc/man/man5/slapd-config.5
+@@ -878,6 +878,10 @@ If
+ .B slapd
+ is built with support for Transport Layer Security, there are more options
+ you can specify.
++.LP
++When using OpenSSL, if neither  \fBolcTLSCACertificateFile\fP nor
++\fBolcTLSCACertificatePath\fP is set, the system-wide default set of CA
++certificates is used.
+ .TP
+ .B olcTLSCipherSuite: <cipher-suite-spec>
+ Permits configuring what ciphers will be accepted and the preference order.
+diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
+index b6e9250..1653a1b 100644
+--- a/doc/man/man5/slapd.conf.5
++++ b/doc/man/man5/slapd.conf.5
+@@ -1108,6 +1108,10 @@ If
+ .B slapd
+ is built with support for Transport Layer Security, there are more options
+ you can specify.
++.LP
++When using OpenSSL, if neither  \fBTLSCACertificateFile\fP nor
++\fBTLSCACertificatePath\fP is set, the system-wide default set of CA
++certificates is used.
+ .TP
+ .B TLSCipherSuite <cipher-suite-spec>
+ Permits configuring what ciphers will be accepted and the preference order.

openldap-reentrant-gethostby.patch

@@ -8,7 +8,7 @@ Resolves: #179730
 Author: Jeffery Layton <jlayton@redhat.com>
 
 diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
-index 373c81c..a012062 100644
+index aa69f70..4461bf2 100644
 --- a/libraries/libldap/util-int.c
 +++ b/libraries/libldap/util-int.c
 @@ -52,8 +52,8 @@ extern int h_errno;
@@ -22,7 +22,7 @@ index 373c81c..a012062 100644
  
  #else
  # include <ldap_pvt_thread.h>
-@@ -317,7 +317,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod)
+@@ -442,7 +442,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod)
  #define BUFSTART (1024-32)
  #define BUFMAX (32*1024-32)
  

openldap-slapi-fix-plugin-plugin_pblock_new-usage.patch

@@ -0,0 +1,23 @@
+From c7a4bd27f5dcf93806972aab236001f1d4801e80 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Wed, 31 Jan 2024 16:00:30 +0000
+Subject: [PATCH] ITS#10166 slapi: fix plugin.c plugin_pblock_new() usage
+
+Broken in 9142da8eaf691720f7d6288954250ef085bd3da0
+---
+ servers/slapd/slapi/plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
+index ca5dbead59..bfa5c10344 100644
+--- a/servers/slapd/slapi/plugin.c
++++ b/servers/slapd/slapi/plugin.c
+@@ -694,7 +694,7 @@ slapi_int_read_config(
+ 		int rc;
+ 		Slapi_PBlock *pPlugin;
+ 
+-		pPlugin = plugin_pblock_new( iType, numPluginArgc, c->argv );
++		pPlugin = plugin_pblock_new( iType, numPluginArgc, c );
+ 		if (pPlugin == NULL) {
+ 			return 1;
+ 		}

openldap-smbk5pwd-overlay.patch

@@ -9,7 +9,7 @@ Author: Jan Vcelak <jvcelak@redhat.com>
 Resolves: #841560
 
 diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README
-index f20ad94..b6433ff 100644
+index 4a710a7..0cd4e9e 100644
 --- a/contrib/slapd-modules/smbk5pwd/README
 +++ b/contrib/slapd-modules/smbk5pwd/README
 @@ -1,3 +1,8 @@
@@ -22,10 +22,10 @@ index f20ad94..b6433ff 100644
  PasswordModify Extended Operation to update Kerberos keys and Samba
  password hashes for an LDAP user.
 diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index 3af20e8..ef73663 100644
+index b84bc54..b5c3fc8 100644
 --- a/servers/slapd/overlays/Makefile.in
 +++ b/servers/slapd/overlays/Makefile.in
-@@ -33,7 +33,8 @@ SRCS = overlays.c \
+@@ -37,7 +37,8 @@ SRCS = overlays.c \
  	syncprov.c \
  	translucent.c \
  	unique.c \
@@ -35,7 +35,7 @@ index 3af20e8..ef73663 100644
  OBJS = statover.o \
  	@SLAPD_STATIC_OVERLAYS@ \
  	overlays.o
-@@ -53,7 +54,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+@@ -57,7 +58,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  
  LIBRARY = ../liboverlays.a
@@ -44,7 +44,7 @@ index 3af20e8..ef73663 100644
  
  XINCPATH = -I.. -I$(srcdir)/..
  XDEFS = $(MODULES_CPPFLAGS)
-@@ -125,6 +126,12 @@ unique.la : unique.lo
+@@ -141,6 +142,12 @@ unique.la : unique.lo
  valsort.la : valsort.lo
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  
@@ -57,6 +57,3 @@ index 3af20e8..ef73663 100644
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \
  		$(MKDIR) $(DESTDIR)$(moduledir); \
--- 
-1.7.10.4
-

openldap-sql-linking.patch

@@ -1,14 +0,0 @@
-Removes unnecessary linking of SQL libraries into slapd. This makes openldap-servers package
-independent on libodbc. (SQL backend is packaged separately in openldap-servers-sql.)
-
---- openldap-2.4.24.orig/build/top.mk
-+++ openldap-2.4.24/build/top.mk
-@@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
- SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
- SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
- 
--SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
-+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
- 
- # Our Defaults
- CC = $(AC_CC)

openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch

@@ -6,10 +6,12 @@ Proof of concept for fixing http://bugs.debian.org/327585
 (patch ported from freeradius bug http://bugs.debian.org/416266)
 
 Resolves: #960048
----
---- openldap/servers/slapd/module.c.orig	2010-05-18 17:42:04.000000000 +0200
-+++ openldap/servers/slapd/module.c	2010-05-18 17:45:46.000000000 +0200
-@@ -117,6 +117,20 @@
+
+diff --git a/servers/slapd/module.c b/servers/slapd/module.c
+index e616f1d..52bacff 100644
+--- a/servers/slapd/module.c
++++ b/servers/slapd/module.c
+@@ -117,6 +117,20 @@ int module_unload( const char *file_name )
  	return -1;	/* not found */
  }
  
@@ -30,7 +32,7 @@ Resolves: #960048
  int module_load(const char* file_name, int argc, char *argv[])
  {
  	module_loaded_t *module;
-@@ -180,7 +194,7 @@
+@@ -179,7 +193,7 @@ int module_load(const char* file_name, int argc, char *argv[])
  	 * to calling Debug. This is because Debug is a macro that expands
  	 * into multiple function calls.
  	 */

openldap-tls-no-reuse-of-tls_session.patch

@@ -1,92 +0,0 @@
-TLS: do not reuse tls_session if hostname check fails
-
-If multiple servers are specified, the connection to the first one succeeds, and the hostname verification fails,
-*tls_session is not dropped, but reused when connecting to the second server.
-
-This is a problem with Mozilla NSS backend because another handshake cannot be performed on the same file descriptor.
-From this reason, hostname checking was moved into ldap_int_tls_connect() before connection error handling.
-
-Author: Jan Vcelak <jvcelak@redhat.com>
-Upstream ITS: #7373
-Resolves: #852476 
-
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 10b993b..a3cd590 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -320,7 +320,7 @@ update_flags( Sockbuf *sb, tls_session * ssl, int rc )
-  */
- 
- static int
--ldap_int_tls_connect( LDAP *ld, LDAPConn *conn )
-+ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
- {
- 	Sockbuf *sb = conn->lconn_sb;
- 	int	err;
-@@ -365,6 +365,10 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn )
- 	errno = WSAGetLastError();
- #endif
- 
-+	if ( err == 0 ) {
-+		err = ldap_pvt_tls_check_hostname( ld, ssl, host );
-+	}
-+
- 	if ( err < 0 )
- 	{
- 		char buf[256], *msg;
-@@ -495,7 +499,15 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
- {
- 	tls_session *session = s;
- 
--	return tls_imp->ti_session_chkhost( ld, session, name_in );
-+	if (ld->ld_options.ldo_tls_require_cert != LDAP_OPT_X_TLS_NEVER &&
-+	    ld->ld_options.ldo_tls_require_cert != LDAP_OPT_X_TLS_ALLOW) {
-+		ld->ld_errno = tls_imp->ti_session_chkhost( ld, session, name_in );
-+		if (ld->ld_errno != LDAP_SUCCESS) {
-+			return ld->ld_errno;
-+		}
-+	}
-+
-+	return LDAP_SUCCESS;
- }
- 
- int
-@@ -857,7 +869,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
- #endif /* LDAP_USE_NON_BLOCKING_TLS */
- 
- 	ld->ld_errno = LDAP_SUCCESS;
--	ret = ldap_int_tls_connect( ld, conn );
-+	ret = ldap_int_tls_connect( ld, conn, host );
- 
- #ifdef LDAP_USE_NON_BLOCKING_TLS
- 	while ( ret > 0 ) { /* this should only happen for non-blocking io */
-@@ -878,7 +890,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
- 		} else {
- 			/* ldap_int_poll called ldap_pvt_ndelay_off */
- 			ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_SET_NONBLOCK, sb );
--			ret = ldap_int_tls_connect( ld, conn );
-+			ret = ldap_int_tls_connect( ld, conn, host );
- 			if ( ret > 0 ) { /* need to call tls_connect once more */
- 				struct timeval curr_time_tv, delta_tv;
- 
-@@ -935,20 +947,6 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
- 		return (ld->ld_errno);
- 	}
- 
--	ssl = ldap_pvt_tls_sb_ctx( sb );
--	assert( ssl != NULL );
--
--	/* 
--	 * compare host with name(s) in certificate
--	 */
--	if (ld->ld_options.ldo_tls_require_cert != LDAP_OPT_X_TLS_NEVER &&
--	    ld->ld_options.ldo_tls_require_cert != LDAP_OPT_X_TLS_ALLOW) {
--		ld->ld_errno = ldap_pvt_tls_check_hostname( ld, ssl, host );
--		if (ld->ld_errno != LDAP_SUCCESS) {
--			return ld->ld_errno;
--		}
--	}
--
- 	return LDAP_SUCCESS;
- }
- 

openldap.sysusers

@@ -0,0 +1,3 @@
+#Type Name     ID             GECOS                   Home directory  Shell
+g     ldap     55
+u     ldap     55:55          "OpenLDAP server"       /var/lib/ldap   /sbin/nologin

plans/gating.fmf

@@ -0,0 +1,8 @@
+summary: Test plan for openldap
+
+discover:
+   how: fmf
+
+execute:
+  how: tmt
+

slapd.ldif

@@ -9,9 +9,21 @@ cn: config
 #
 # TLS settings
 #
-olcTLSCACertificatePath: /etc/openldap/certs
-olcTLSCertificateFile: "OpenLDAP Server"
-olcTLSCertificateKeyFile: /etc/openldap/certs/password
+# When no CA certificates are specified the Shared System Certificates
+# are in use. In order to have these available along with the ones specified
+# by oclTLSCACertificatePath one has to include them explicitly:
+#olcTLSCACertificateFile: /etc/pki/tls/cert.pem
+#
+# Private cert and key are not pregenerated.
+#olcTLSCertificateFile:
+#olcTLSCertificateKeyFile:
+#
+# System-wide Crypto Policies provide up to date cipher suite which should
+# be used unless one needs a finer grinded selection of ciphers. Hence, the
+# PROFILE=SYSTEM value represents the default behavior which is in place
+# when no explicit setting is used. (see openssl-ciphers(1) for more info)
+#olcTLSCipherSuite: PROFILE=SYSTEM
+
 
 #
 # Do not enable referrals until AFTER you have a working directory
@@ -30,36 +42,41 @@ olcTLSCertificateKeyFile: /etc/openldap/certs/password
 #
 # Load dynamic backend modules:
 # - modulepath is architecture dependent value (32/64-bit system)
-# - back_sql.la backend requires openldap-servers-sql package
 # - dyngroup.la and dynlist.la cannot be used at the same time
 #
 
 #dn: cn=module,cn=config
 #objectClass: olcModuleList
 #cn: module
-#olcModulepath:	/usr/lib/openldap
-#olcModulepath:	/usr/lib64/openldap
+#olcModulepath: /usr/lib/openldap
+#olcModulepath: /usr/lib64/openldap
 #olcModuleload: accesslog.la
+#olcModuleload: allop.la
 #olcModuleload: auditlog.la
+#olcModuleload: autoca.la
+#olcModuleload: back_asyncmeta.la
 #olcModuleload: back_dnssrv.la
 #olcModuleload: back_ldap.la
-#olcModuleload: back_mdb.la
 #olcModuleload: back_meta.la
 #olcModuleload: back_null.la
 #olcModuleload: back_passwd.la
 #olcModuleload: back_relay.la
-#olcModuleload: back_shell.la
 #olcModuleload: back_sock.la
+#olcModuleload: check_password.la
 #olcModuleload: collect.la
 #olcModuleload: constraint.la
 #olcModuleload: dds.la
 #olcModuleload: deref.la
 #olcModuleload: dyngroup.la
 #olcModuleload: dynlist.la
+#olcModuleload: home.la
+#olcModuleload: lloadd.la
 #olcModuleload: memberof.la
+#olcModuleload: otp.la
 #olcModuleload: pcache.la
 #olcModuleload: ppolicy.la
 #olcModuleload: refint.la
+#olcModuleload: remoteauth.la
 #olcModuleload: retcode.la
 #olcModuleload: rwm.la
 #olcModuleload: seqmod.la

slapd.service

@@ -3,7 +3,6 @@ Description=OpenLDAP Server Daemon
 After=syslog.target network-online.target
 Documentation=man:slapd
 Documentation=man:slapd-config
-Documentation=man:slapd-hdb
 Documentation=man:slapd-mdb
 Documentation=file:///usr/share/doc/openldap-servers/guide.html
 

slapd.tmpfiles

@@ -1,2 +1,2 @@
 # openldap runtime directory for slapd.arg and slapd.pid
-d /var/run/openldap 0755 ldap ldap -
+d /run/openldap 0755 ldap ldap -

sources

@@ -1,2 +1,2 @@
-SHA512 (ltb-project-openldap-ppolicy-check-password-1.1.tar.gz) = f3384a164ce5db488908cf6380bad8500b800b09d12a8f04e1b6ccb6f6af6ab3971fcdbe4acca7a1b6d16b408a11065c2b1ab2497863fe07d3c28262b0f6776e
-SHA512 (openldap-2.4.45.tgz) = 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
+SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
+SHA512 (openldap-2.6.10.tgz) = 18129ad9a385457941e3203de5f130fe2571701abf24592c5beffb01361aae3182c196b2cd48ffeecb792b9b0e5f82c8d92445a7ec63819084757bdedba63b20

tests/smoke-test/Makefile

@@ -0,0 +1,83 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/openldap/Sanity/smoke-test
+#   Description: Test calls upstream test suite.
+#   Author: Ondrej Moris <omoris@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/openldap/Sanity/smoke-test
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Viktor Ashirov <vashirov@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test calls upstream test suite." >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        3h" >> $(METADATA)
+	@echo "RunFor:          openldap" >> $(METADATA)
+	@echo "Requires:        openldap" >> $(METADATA)
+	@echo "Requires:        openldap-clients" >> $(METADATA)
+	@echo "Requires:        openldap-servers" >> $(METADATA)
+	@echo "Requires:       	nss-devel" >> $(METADATA)
+	@echo "Requires:        cracklib-devel" >> $(METADATA)
+	@echo "Requires:        cyrus-sasl-devel" >> $(METADATA)
+	@echo "Requires:        gdbm-devel" >> $(METADATA)
+	@echo "Requires:        groff" >> $(METADATA)
+	@echo "Requires:        krb5-devel" >> $(METADATA)
+	@echo "Requires:        libdb-devel" >> $(METADATA)
+	@echo "Requires:        libtool" >> $(METADATA)
+	@echo "Requires:        libtool-ltdl-devel" >> $(METADATA)
+	@echo "Requires:        nfs-utils" >> $(METADATA)
+	@echo "Requires:        openssl-devel" >> $(METADATA)
+	@echo "Requires:        pam-devel" >> $(METADATA)
+	@echo "Requires:        perl" >> $(METADATA)
+	@echo "Requires:        perl-ExtUtils-Embed" >> $(METADATA)
+	@echo "Requires:        pkgconfig" >> $(METADATA)
+	@echo "Requires:        rpm-build" >> $(METADATA)
+	@echo "Requires:        unixODBC-devel" >> $(METADATA)
+	@echo "Requires:        yum-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/smoke-test/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/openldap/Sanity/smoke-test
+Description: Test calls upstream test suite.
+Author: Ondrej Moris <omoris@redhat.com>

tests/smoke-test/main.fmf

@@ -0,0 +1,31 @@
+summary: Test calls upstream test suite
+description: Test calls upstream test suite
+contact: Viktor Ashirov <vashirov@redhat.com>
+component:
+  - openldap
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - openldap
+  - openldap-clients
+  - openldap-servers
+  - cracklib-devel
+  - cyrus-sasl-devel
+  - gdbm-devel
+  - groff
+  - krb5-devel
+  - libdb-devel
+  - libtool
+  - libtool-ltdl-devel
+  - nfs-utils
+  - nss-devel
+  - openssl-devel
+  - pam-devel
+  - perl
+  - perl-ExtUtils-Embed
+  - pkgconf-pkg-config
+  - pkgconfig
+  - rpm-build
+  - unixODBC-devel
+  - yum-utils
+duration: 3h

tests/smoke-test/runtest.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/openldap/Sanity/smoke-test
+#   Description: Test calls upstream test suite.
+#   Author: Ondrej Moris <omoris@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="openldap"
+
+PACKAGES=("openldap"           \
+          "openldap-clients"   \
+          "openldap-servers"   \
+          "cyrus-sasl-devel"   \
+          "gdbm-devel"         \
+          "libtool"            \
+          "krb5-devel"         \
+          "openssl-devel"      \
+          "pam-devel"          \
+          "perl"               \
+          "unixODBC-devel"     \
+          "libtool-ltdl-devel" \
+          "nfs-utils"          \
+          "rpm-build"          \
+          "nss-devel"          \
+          "libdb-devel"        \
+          "groff"              \
+          "cracklib-devel"     \
+          "perl-ExtUtils-Embed"\
+          "pkgconf-pkg-config" )
+
+LDAP_SERVICE='slapd'
+
+rlJournalStart
+
+    rlPhaseStartSetup "General Setup"
+
+        rlRun "TmpDir=$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+
+        for P in "${PACKAGES[@]}"; do rlCheckRpm $P || rlDie; done
+
+        rlFetchSrcForInstalled $PACKAGE
+        rlRun "yum-builddep -y openldap*src.rpm" 0
+        rlRun "rpm -ihv *.rpm" 0
+
+        rlServiceStop $LDAP_SERVICE
+
+    rlPhaseEnd
+
+    rlPhaseStartTest
+
+        TOPDIR=$(rpm --eval %_topdir)
+        rlRun "pushd $TOPDIR" 0
+
+        rlRun "rpmbuild -vv -bc SPECS/openldap.spec >build.log 2>&1" 0
+        [[ $? -ne 0 ]] && cat build.log
+        VERSION=$(rpm -q --qf "%{VERSION}\n" openldap | tail -1)
+        rlRun "pushd BUILD/openldap-${VERSION}-build/openldap-${VERSION}/openldap-${VERSION}" 0
+        # workaround for failing test, it tests unsupported configuration
+        # see http://www.openldap.org/lists/openldap-technical/201204/msg00080.html for upstream reply
+        # change of check after test is not enough because run of all tests with hdb is skipped if test058 fails with bdb
+        #rm -f tests/scripts/test058-syncrepl-asymmetric
+
+        rlRun "make check > make_check.out 2>&1" 0
+
+        grep ">>>>" make_check.out > make_check.results
+        cat make_check.out
+        echo -e "\n\nResults:\n\n"
+        cat make_check.results
+
+        rlAssertNotGrep "failed" make_check.results
+
+        rlRun "popd" 0
+        rlRun "popd" 0
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+
+        rlServiceRestore $LDAP_SERVICE
+        rlRun "rm -rf BUILD/opendap-$(rpm -q --qf "%{VERSION}" openldap)" 0
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+
+    rlPhaseEnd
+
+rlJournalPrintText
+
+rlJournalEnd