pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases OpenLDAP 2.4.45 Release (2017/06/01)



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d03b12a4fad1
branches:  trunk
changeset: 363142:d03b12a4fad1
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jun 02 08:29:56 2017 +0000

description:
OpenLDAP 2.4.45 Release (2017/06/01)
        Added slapd support for OpenSSL 1.1.0 series (ITS-8353, ITS-8533, ITS-8634)
        Fixed libldap to fail ldap_result if the handle is already bad (ITS-8585)
        Fixed libldap to expose error if user specified CA doesn't exist (ITS-8529)
        Fixed libldap handling of Diffie-Hellman parameters (ITS-7506)
        Fixed libldap GnuTLS use after free (ITS-8385)
        Fixed libldap SASL initialization (ITS-8648)
        Fixed slapd bconfig rDN escape handling (ITS-8574)
        Fixed slapd segfault with invalid hostname (ITS-8631)
        Fixed slapd sasl SEGV rebind in same session (ITS-8568)
        Fixed slapd syncrepl filter handling (ITS-8413)
        Fixed slapd syncrepl infinite looping mods with delta-sync MMR (ITS-8432)
        Fixed slapd callback struct so older modules without writewait should function.
                    Custom modules may need to be updated for sc_writewait callback (ITS-8435)
        Fixed slapd-ldap/meta broken LDAP_TAILQ macro (ITS-8576)
        Fixed slapd-mdb so it passes ITS6794 regression test (ITS-6794)
        Fixed slapd-mdb double free with size zero paged result (ITS-8655)
        Fixed slapd-meta uninitialized diagnostic message (ITS-8442)
        Fixed slapo-accesslog to honor pauses during purge for cn=config update (ITS-8423)
        Fixed slapo-accesslog with multiple modifications to the same attribute (ITS-6545)
        Fixed slapo-relay to correctly initialize sc_writewait (ITS-8428)
        Fixed slapo-sssvlv double free (ITS-8592)
        Fixed slapo-unique with empty modifications (ITS-8266)
        Build Environment
                Added test065 for proxyauthz (ITS-8571)
                Fix test008 to be portable (ITS-8414)
                Fix test064 to wait for slapd to start (ITS-8644)
                Fix its4336 regression test (ITS-8534)
                Fix its4337 regression test (ITS-8535)
                Fix regression tests to execute on all backends (ITS-8539)
        Contrib
                Added slapo-autogroup(5) man page (ITS-8569)
                Added passwd missing conversion scripts for apr1 (ITS-6826)
                Fixed contrib modules where the writewait callback was not correctly initialized (ITS-8435)
                Fixed smbk5pwd to build with newer OpenSSL releases (ITS-8525)
        Documentation
                admin24 fixed tls_cipher_suite bindconf option (ITS-8099)
                admin24 fixed typo cn=config to be slapd.d (ITS-8449)
                admin24 fixed slapo-syncprov information to be curent (ITS-8253)
                admin24 fixed typo in access control docs (ITS-7341, ITS-8391)
                admin24 fixed minor typo in tuning guide (ITS-8499)
                admin24 fixed information about the limits option (ITS-7700)
                admin24 fixed missing options for syncrepl configuration (ITS-7700)
                admin24 fixed accesslog documentation to note it should not be replicated (ITS-8344)
                Fixed ldap.conf(5) missing information on SASL_NOCANON option (ITS-7177)
                Fixed ldapsearch(1) information on the V[V] flag behavior (ITS-7177, ITS-6339)
                Fixed slapd-config(5), slapd.conf(5) clarification on interval keyword for refreshAndPersist (ITS-8538)
                Fixed slapd-config(5), slapd.conf(5) clarify serverID requirements (ITS-8635)
                Fixed slapd-config(5), slapd.conf(5) clarification on loglevel settings (ITS-8123)
                Fixed slapo-ppolicy(5) to clearly note rootdn requirement (ITS-8565)
                Fixed slapo-memberof(5) to note it is not safe to use with replication (ITS-8613)
                Fixed slapo-syncprov(5) documentation to be current (ITS-8253)
                Fixed slapadd(8) manpage to note slapd-mdb (ITS-8215)
                Fixed various minor grammar issues in the man pages (ITS-8544)
                Fixed various typos (ITS-8587)

diffstat:

 databases/openldap-client/Makefile                                   |    3 +-
 databases/openldap-cloak/Makefile                                    |    3 +-
 databases/openldap-doc/distinfo                                      |   10 +-
 databases/openldap-nops/Makefile                                     |    3 +-
 databases/openldap-server/Makefile                                   |    3 +-
 databases/openldap-smbk5pwd/Makefile                                 |    4 +-
 databases/openldap/Makefile                                          |    3 +-
 databases/openldap/Makefile.version                                  |    4 +-
 databases/openldap/distinfo                                          |   17 +-
 databases/openldap/patches/patch-ag                                  |   18 +-
 databases/openldap/patches/patch-contrib_modules_smbk5pwd-smbk5pwd.c |   54 --
 databases/openldap/patches/patch-its7506                             |  222 ----------
 databases/openldap/patches/patch-its7595                             |   78 +--
 databases/openldap/patches/patch-libraries_liblmdb_mdb.c             |   39 -
 14 files changed, 58 insertions(+), 403 deletions(-)

diffs (truncated from 726 to 300 lines):

diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap-client/Makefile
--- a/databases/openldap-client/Makefile        Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap-client/Makefile        Fri Jun 02 08:29:56 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2016/12/13 10:38:06 he Exp $
+# $NetBSD: Makefile,v 1.26 2017/06/02 08:29:56 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   3
 COMMENT=       Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=            openldap<2.3.23nb1
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap-cloak/Makefile
--- a/databases/openldap-cloak/Makefile Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap-cloak/Makefile Fri Jun 02 08:29:56 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2017/06/02 08:29:56 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-cloak-/}
-PKGREVISION=   1
 COMMENT=       Hide specific attributes unless explicitely requested for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap-doc/distinfo
--- a/databases/openldap-doc/distinfo   Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap-doc/distinfo   Fri Jun 02 08:29:56 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2016/02/07 08:42:59 adam Exp $
+$NetBSD: distinfo,v 1.17 2017/06/02 08:29:57 adam Exp $
 
-SHA1 (openldap-2.4.44.tgz) = 016a738d050a68d388602a74b5e991035cdba149
-RMD160 (openldap-2.4.44.tgz) = 6ea3139f630e93c6e0af60638672d88d6c535a6a
-SHA512 (openldap-2.4.44.tgz) = 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136
-Size (openldap-2.4.44.tgz) = 5658830 bytes
+SHA1 (openldap-2.4.45.tgz) = c98437385d3eaee80c9e2c09f3f0d4b7c140233d
+RMD160 (openldap-2.4.45.tgz) = a2f4483ffb958cc103a2aa0fb13c1f78e7951263
+SHA512 (openldap-2.4.45.tgz) = 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
+Size (openldap-2.4.45.tgz) = 5672845 bytes
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap-nops/Makefile
--- a/databases/openldap-nops/Makefile  Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap-nops/Makefile  Fri Jun 02 08:29:56 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2016/03/05 11:28:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2017/06/02 08:29:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nops-/}
-PKGREVISION=   1
 COMMENT=       Remove null-ops for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap-server/Makefile
--- a/databases/openldap-server/Makefile        Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap-server/Makefile        Fri Jun 02 08:29:56 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2016/12/13 10:38:06 he Exp $
+# $NetBSD: Makefile,v 1.51 2017/06/02 08:29:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
 COMMENT=       Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=    openldap<2.3.23nb1
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap-smbk5pwd/Makefile
--- a/databases/openldap-smbk5pwd/Makefile      Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap-smbk5pwd/Makefile      Fri Jun 02 08:29:56 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2016/12/12 14:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/06/02 08:29:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-smbk5pwd-/}
-PKGREVISION=   2
 COMMENT=       Samba and Kerberos password sync for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1
@@ -30,6 +29,7 @@
 CPPFLAGS+=     -DDO_SAMBA
 .endif
 
+LIBS+=         -L${BUILDLINK_PREFIX.openssl}/lib
 MAKE_ENV+=     EXTRA_LIBS=${LIBS:M*:Q}
 
 .include "../../databases/openldap/Makefile.common"
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap/Makefile
--- a/databases/openldap/Makefile       Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap/Makefile       Fri Jun 02 08:29:56 2017 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.146 2016/12/13 10:38:06 he Exp $
+# $NetBSD: Makefile,v 1.147 2017/06/02 08:29:56 adam Exp $
 
-PKGREVISION= 2
 .include "../../databases/openldap/Makefile.version"
 
 DISTNAME=      openldap-${OPENLDAP_VERSION}
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap/Makefile.version
--- a/databases/openldap/Makefile.version       Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap/Makefile.version       Fri Jun 02 08:29:56 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.13 2016/02/07 08:42:59 adam Exp $
+# $NetBSD: Makefile.version,v 1.14 2017/06/02 08:29:56 adam Exp $
 # used by databases/openldap/Makefile
 # used by databases/openldap/Makefile.common
 # used by databases/openldap-docs/Makefile
 
-OPENLDAP_VERSION=      2.4.44
+OPENLDAP_VERSION=      2.4.45
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap/distinfo
--- a/databases/openldap/distinfo       Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap/distinfo       Fri Jun 02 08:29:56 2017 +0000
@@ -1,26 +1,23 @@
-$NetBSD: distinfo,v 1.108 2016/12/13 10:38:06 he Exp $
+$NetBSD: distinfo,v 1.109 2017/06/02 08:29:56 adam Exp $
 
-SHA1 (openldap-2.4.44.tgz) = 016a738d050a68d388602a74b5e991035cdba149
-RMD160 (openldap-2.4.44.tgz) = 6ea3139f630e93c6e0af60638672d88d6c535a6a
-SHA512 (openldap-2.4.44.tgz) = 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136
-Size (openldap-2.4.44.tgz) = 5658830 bytes
+SHA1 (openldap-2.4.45.tgz) = c98437385d3eaee80c9e2c09f3f0d4b7c140233d
+RMD160 (openldap-2.4.45.tgz) = a2f4483ffb958cc103a2aa0fb13c1f78e7951263
+SHA512 (openldap-2.4.45.tgz) = 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
+Size (openldap-2.4.45.tgz) = 5672845 bytes
 SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
-SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896
+SHA1 (patch-ag) = 380336d8b50dd6b3a277f2ea6a03eb88cc5919b8
 SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68
 SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
 SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
 SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
 SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
-SHA1 (patch-contrib_modules_smbk5pwd-smbk5pwd.c) = c31fc75f94778c93dfb20e7b7fc6ab8c74212942
 SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 47c81def0c013a360acb549ed69e9042f0bc1be3
 SHA1 (patch-contrib_slapd-modules_nops_Makefile) = c51bccf34c3f3112232a134038622d31b6315628
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
 SHA1 (patch-da) = 75e26bd08c6e66b69192ebfbb36db974d391ec3e
 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
-SHA1 (patch-its7506) = a50f9428d6d7dd28f71d21e11ae3f8b0f1372f75
-SHA1 (patch-its7595) = 9ea396adb7f2fd572d60190534caa80a01ef79d2
+SHA1 (patch-its7595) = 941b055bb5ac1f963b9d39384d3627a32f531cf1
 SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
 SHA1 (patch-libraries_libldap_tls__m.c) = 91dab1dcfa6560c30093094586ea9eabf2e977b8
-SHA1 (patch-libraries_liblmdb_mdb.c) = 590a059d784687f678ac44a577770551b11a2be5
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap/patches/patch-ag
--- a/databases/openldap/patches/patch-ag       Fri Jun 02 08:21:51 2017 +0000
+++ b/databases/openldap/patches/patch-ag       Fri Jun 02 08:29:56 2017 +0000
@@ -1,6 +1,9 @@
-$NetBSD: patch-ag,v 1.7 2012/03/13 19:57:11 adam Exp $
+$NetBSD: patch-ag,v 1.8 2017/06/02 08:29:56 adam Exp $
 
---- servers/slapd/Makefile.in.orig     2007-02-14 16:59:43.000000000 +0100
+slapd must be installed unstripped: on some platorms (Darwin) tcp_wrappers'
+  variable called "allow_severity" must not be stripped away.
+
+--- servers/slapd/Makefile.in.orig     2016-02-05 23:57:45.000000000 +0000
 +++ servers/slapd/Makefile.in
 @@ -76,6 +76,10 @@ XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_
  XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
@@ -13,7 +16,16 @@
  BUILD_OPT = "--enable-slapd"
  BUILD_SRV = @BUILD_SLAPD@
  
-@@ -441,9 +445,7 @@ install-db-config: FORCE
+@@ -378,7 +382,7 @@ install-local-srv: install-slapd install
+ install-slapd: FORCE
+       -$(MKDIR) $(DESTDIR)$(libexecdir)
+       -$(MKDIR) $(DESTDIR)$(localstatedir)/run
+-      $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
++      $(LTINSTALL) $(INSTALLFLAGS) -m 755 \
+               slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
+       @for i in $(SUBDIRS); do \
+           if test -d $$i && test -f $$i/Makefile ; then \
+@@ -447,9 +451,7 @@ install-db-config: FORCE
        @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
        @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
        $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap/patches/patch-contrib_modules_smbk5pwd-smbk5pwd.c
--- a/databases/openldap/patches/patch-contrib_modules_smbk5pwd-smbk5pwd.c      Fri Jun 02 08:21:51 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-$NetBSD: patch-contrib_modules_smbk5pwd-smbk5pwd.c,v 1.1 2016/10/30 05:04:09 manu Exp $
-
-Submitted upstream as ITS#8525
-http://www.openldap.org/its/index.cgi/Incoming?id=8525
-
-From 1aad89bbdd1f58f3b2d794067cc8c4a60876f584 Mon Sep 17 00:00:00 2001
-From: Emmanuel Dreyfus <manu%netbsd.org@localhost>
-Date: Sun, 30 Oct 2016 05:34:58 +0100
-Subject: [PATCH] Use newer DES API so that smbk5pwd loads with newer OpenSSL
-
-OpenSSL removed old DES API which used des_* functions.
-https://github.com/openssl/openssl/commit/24956ca00f014a917fb181a8abc39b349f3f316f
-
-In order to link with libcrypto from recent OpenSSL releases, we need
-to replace the older API des_* functions by the newer API DES_* functions.
-
-Signed-off-by: Emmanuel Dreyfus <manu%netbsd.org@localhost>
----
- contrib/slapd-modules/smbk5pwd/smbk5pwd.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git contrib/slapd-modules/smbk5pwd/smbk5pwd.c contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-index bec5e1b..97e0055 100644
---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-@@ -154,7 +154,7 @@ static void lmPasswd_to_key(
-       k[7] = ((lpw[6]&0x7F)<<1);
- 
- #ifdef HAVE_OPENSSL
--      des_set_odd_parity( key );
-+      DES_set_odd_parity( key );
- #endif
- }
- 
-@@ -210,12 +210,12 @@ static void lmhash(
-       des_set_key( &ctx, key );
-       des_encrypt( &ctx, sizeof(key), hbuf[1], StdText );
- #elif defined(HAVE_OPENSSL)
--      des_set_key_unchecked( &key, schedule );
--      des_ecb_encrypt( &StdText, &hbuf[0], schedule , DES_ENCRYPT );
-+      DES_set_key_unchecked( &key, &schedule );
-+      DES_ecb_encrypt( &StdText, &hbuf[0], &schedule , DES_ENCRYPT );
- 
-       lmPasswd_to_key( &UcasePassword[7], &key );
--      des_set_key_unchecked( &key, schedule );
--      des_ecb_encrypt( &StdText, &hbuf[1], schedule , DES_ENCRYPT );
-+      DES_set_key_unchecked( &key, &schedule );
-+      DES_ecb_encrypt( &StdText, &hbuf[1], &schedule , DES_ENCRYPT );
- #endif
- 
-       hexify( (char *)hbuf, hash );
--- 
-2.3.2
-
diff -r 98e488af0501 -r d03b12a4fad1 databases/openldap/patches/patch-its7506
--- a/databases/openldap/patches/patch-its7506  Fri Jun 02 08:21:51 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-$NetBSD: patch-its7506,v 1.1 2015/07/15 16:33:57 manu Exp $
-
-Upstream fix for ignored TLSDHParamFile option
-
-From 6f120920d359d3b880c5c56bde4c1b91c3bedb01 Mon Sep 17 00:00:00 2001
-From: Ben Jencks <ben%bjencks.net@localhost>
-Date: Sun, 27 Jan 2013 18:27:03 -0500
-Subject: [PATCH] ITS#7506 tls_o.c: Fix Diffie-Hellman parameter usage.
-
-If a DHParamFile or olcDHParamFile is specified, then it will be used,
-otherwise a hardcoded 1024 bit parameter will be used. This allows the use of
-larger parameters; previously only 512 or 1024 bit parameters would ever be
-used.
-
-From cfeb28412c28ce9feeea6e6c055286f201bd0a34 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc%openldap.org@localhost>
-Date: Sat, 7 Sep 2013 06:39:53 -0700
-Subject: [PATCH] ITS#7506 fix prev commit
-
-The patch unconditionally enabled DHparams, which is a significant
-change of behavior. Reverting to previous behavior, which only enables
-DH use if a DHparam file was configured.
-
---- libraries/libldap/tls_o.c.orig     2015-07-15 18:14:17.000000000 +0200
-+++ libraries/libldap/tls_o.c  2015-07-15 18:14:41.000000000 +0200
-@@ -58,26 +58,15 @@
- static int tlso_verify_cb( int ok, X509_STORE_CTX *ctx );
- static int tlso_verify_ok( int ok, X509_STORE_CTX *ctx );
- static RSA * tlso_tmp_rsa_cb( SSL *ssl, int is_export, int key_length );
- 
--static DH * tlso_tmp_dh_cb( SSL *ssl, int is_export, int key_length );
--
--typedef struct dhplist {
--      struct dhplist *next;
--      int keylength;
--      DH *param;
--} dhplist;
--
--static dhplist *tlso_dhparams;
--
- static int tlso_seed_PRNG( const char *randfile );
- 
- #ifdef LDAP_R_COMPILE
- /*
-  * provide mutexes for the OpenSSL library.
-  */
- static ldap_pvt_thread_mutex_t        tlso_mutexes[CRYPTO_NUM_LOCKS];
--static ldap_pvt_thread_mutex_t        tlso_dh_mutex;
- 
- static void tlso_locking_cb( int mode, int type, const char *file, int line )
- {
-       if ( mode & CRYPTO_LOCK ) {
-@@ -106,9 +95,8 @@
- 
-       for( i=0; i< CRYPTO_NUM_LOCKS ; i++ ) {
-               ldap_pvt_thread_mutex_init( &tlso_mutexes[i] );
-       }
--      ldap_pvt_thread_mutex_init( &tlso_dh_mutex );
-       CRYPTO_set_locking_callback( tlso_locking_cb );
-       CRYPTO_set_id_callback( tlso_thread_self );
- }
- #endif /* LDAP_R_COMPILE */



Home | Main Index | Thread Index | Old Index