On Tue, 2011-12-20 at 12:46 -0500, Simo Sorce wrote:
> This patch is needed to fix the slapi plugins to build against the
> thread-safe (reentrant) version of openldap libraries.
> 
> I haven't changed ipa-clients because they are not threaded programs and
> wanted to restrict the change as much as possible.
> 
> Fixes #2198.
> 
> The same patch can be cherry-picked against both 2.1.x and master.

I actually created 2 new patches (one for 2-1 and one for master) where
I also change the spec file so that freeipa packages depend on the new
389ds package that uses the ldap_r library as both 389ds and plugins
must be build with the same libraries.

Simo.

-- 
Simo Sorce * Red Hat, Inc * New York
>From e744b07fe589d36257590f31adf7a5dae3a51f55 Mon Sep 17 00:00:00 2001
From: Simo Sorce <sso...@redhat.com>
Date: Tue, 20 Dec 2011 12:39:34 -0500
Subject: [PATCH] slapi-plugins: use thread-safe ldap library

---
 daemons/configure.ac |    2 +-
 freeipa.spec.in      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemons/configure.ac b/daemons/configure.ac
index d15a5c70c000a9d83f9ccb6d05851f1400ae4627..9ff858a6b360b011be95ff9aac729a0e837356c2 100644
--- a/daemons/configure.ac
+++ b/daemons/configure.ac
@@ -174,7 +174,7 @@ if test "$with_ldap" = "yes"; then
   if test "$with_ldap_lber" = "yes" ; then
     OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber"
   fi
-  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
+  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap_r"
 else
   AC_MSG_ERROR([OpenLDAP not found])
 fi
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 3305fda55a30523d0b86a0fb79ee74f60a544b92..36b68795eec02d11176c2369b50ec6c732925ad1 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -24,7 +24,7 @@ Source0:        freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
-BuildRequires:  389-ds-base-devel >= 1.2.9
+BuildRequires:  389-ds-base-devel >= 1.2.10-0.6.a6
 BuildRequires:  svrcore-devel
 BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
-- 
1.7.7.4

>From da72c36eb1c11d824935d4d1bb352b50d071a070 Mon Sep 17 00:00:00 2001
From: Simo Sorce <sso...@redhat.com>
Date: Tue, 20 Dec 2011 12:39:34 -0500
Subject: [PATCH] slapi-plugins: use thread-safe ldap library

---
 daemons/configure.ac |    2 +-
 freeipa.spec.in      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemons/configure.ac b/daemons/configure.ac
index bee260dcd41ae9e69d3eaa80961d3a55571c74f8..deaa47358445fa552f5a9b53c9b65a9550b71d9e 100644
--- a/daemons/configure.ac
+++ b/daemons/configure.ac
@@ -174,7 +174,7 @@ if test "$with_ldap" = "yes"; then
   if test "$with_ldap_lber" = "yes" ; then
     OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber"
   fi
-  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
+  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap_r"
 else
   AC_MSG_ERROR([OpenLDAP not found])
 fi
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 46aefe1f5909be663bc2a2495a9ac9e067ef933e..300a938dfacb3eeb55bf89cd604fc79de144738d 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -24,7 +24,7 @@ Source0:        freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
-BuildRequires: 389-ds-base-devel >= 1.2.10-0.5.a5
+BuildRequires: 389-ds-base-devel >= 1.2.10-0.6.a6
 BuildRequires:  svrcore-devel
 BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
-- 
1.7.7.4

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to