rpms/sssd/EL-5 0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch, NONE, 1.1 sssd.spec, 1.40, 1.41

[Stephen Gallagher]

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28997

Modified Files:
	sssd.spec 
Added Files:
	0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch 
Log Message:
* Sun Jun 06 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.0-13
- Retag to account for missing patch file.


0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch:
 sdap.h                  |   10 ++++++++++
 sdap_async_connection.c |    5 ++---
 2 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch ---
>From ea17887efffe046bfc018d375b28562d5e5d425a Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri, 4 Jun 2010 11:11:07 -0400
Subject: [PATCH] Fix broken build against older versions of OpenLDAP

OpenLDAP < 2.4 used LDAP_OPT_ERROR_STRING. It was changed to
LDAP_OPT_DIAGNOSTIC_MESSAGE in 2.4. This patch will allow the TLS
error messages to be displayed on either version.
---
 src/providers/ldap/sdap.h                  |   10 ++++++++++
 src/providers/ldap/sdap_async_connection.c |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index 0fc95df84c01b810ed0c8c0d5ccc46c375141a5f..09312282bd07e72cabe06a00898d77f04e3e07c0 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -26,6 +26,16 @@
 #include <ldap.h>
 #include "util/sss_ldap.h"
 
+#ifdef LDAP_OPT_DIAGNOSTIC_MESSAGE
+#define SDAP_DIAGNOSTIC_MESSAGE LDAP_OPT_DIAGNOSTIC_MESSAGE
+#else
+#ifdef LDAP_OPT_ERROR_STRING
+#define SDAP_DIAGNOSTIC_MESSAGE LDAP_OPT_ERROR_STRING
+#else
+#error No extended diagnostic message available
+#endif
+#endif
+
 struct sdap_msg {
     struct sdap_msg *next;
     LDAPMessage *msg;
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 98249ea69f7aa81e8ed092d4f80963bbb22d63c6..14a1a4b7d2989a1623159cb5ef3caa041d0d5d52 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -147,7 +147,7 @@ struct tevent_req *sdap_connect_send(TALLOC_CTX *memctx,
     lret = ldap_start_tls(state->sh->ldap, NULL, NULL, &msgid);
     if (lret != LDAP_SUCCESS) {
         optret = ldap_get_option(state->sh->ldap,
-                                 LDAP_OPT_DIAGNOSTIC_MESSAGE,
+                                 SDAP_DIAGNOSTIC_MESSAGE,
                                  (void*)&errmsg);
         if (optret == LDAP_SUCCESS) {
             DEBUG(3, ("ldap_start_tls failed: [%s] [%s]\n",
@@ -230,7 +230,7 @@ static void sdap_connect_done(struct sdap_op *op,
     if (ret != LDAP_SUCCESS) {
 
         optret = ldap_get_option(state->sh->ldap,
-                                 LDAP_OPT_DIAGNOSTIC_MESSAGE,
+                                 SDAP_DIAGNOSTIC_MESSAGE,
                                  (void*)&tlserr);
         if (optret == LDAP_SUCCESS) {
             DEBUG(3, ("ldap_install_tls failed: [%s] [%s]\n",
-- 
1.7.0.1



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/EL-5/sssd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sssd.spec	6 Jun 2010 17:52:06 -0000	1.40
+++ sssd.spec	6 Jun 2010 17:57:19 -0000	1.41
@@ -7,7 +7,7 @@ Name: sssd
 Version: 1.2.0
 #Never reset the Release, always increment it
 #Otherwise we can have issues if library versions do not change
-Release: 12%{?dist}
+Release: 13%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -455,7 +455,10 @@ fi
 %postun -n libref_array -p /sbin/ldconfig
 
 %changelog
-* Mon May 24 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.0-12
+* Sun Jun 06 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.0-13
+- Retag to account for missing patch file.
+
+* Sun Jun 06 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.0-12
 - New stable upstream version 1.2.0
 - Support ServiceGroups for FreeIPA v2 HBAC rules
 - Fix long-standing issue with auth_provider = proxy