[evolution-data-server/f17] Add patch for Red Hat bug #814341 (crash in ldap's authenticate_user)

Milan Crha mcrha at fedoraproject.org
Fri Nov 16 09:08:22 UTC 2012


commit 2a1254849108fc68b84a2220c2800ad917a6f3ad
Author: Milan Crha <mcrha at redhat.com>
Date:   Fri Nov 16 10:08:11 2012 +0100

    Add patch for Red Hat bug #814341 (crash in ldap's authenticate_user)

 evolution-data-server-3.4.4-authmethod.patch |   12 ++++++++++++
 evolution-data-server.spec                   |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.4.4-authmethod.patch b/evolution-data-server-3.4.4-authmethod.patch
new file mode 100644
index 0000000..2943f16
--- /dev/null
+++ b/evolution-data-server-3.4.4-authmethod.patch
@@ -0,0 +1,12 @@
+diff -up evolution-data-server-3.4.4/addressbook/backends/ldap/e-book-backend-ldap.c.authmethod evolution-data-server-3.4.4/addressbook/backends/ldap/e-book-backend-ldap.c
+--- evolution-data-server-3.4.4/addressbook/backends/ldap/e-book-backend-ldap.c.authmethod	2012-10-16 11:11:54.497892050 +0200
++++ evolution-data-server-3.4.4/addressbook/backends/ldap/e-book-backend-ldap.c	2012-10-16 11:13:06.801816975 +0200
+@@ -5120,6 +5120,8 @@ e_book_backend_ldap_authenticate_user (E
+ 
+ 		source = e_backend_get_source (E_BACKEND (backend));
+ 		auth_method = e_source_get_property (source, "auth");
++		if (!auth_method)
++			auth_method = "none";
+ 	}
+ 
+ 	if (!e_backend_get_online (E_BACKEND (backend))) {
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1c470b1..8a0bb84 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 3.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -47,6 +47,9 @@ Patch02: evolution-data-server-3.4.4-maildir-filters.patch
 # RH bug #842099
 Patch03: evolution-data-server-3.4.4-mh-leak.patch
 
+# RH bug #814341
+Patch04: evolution-data-server-3.4.4-authmethod.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -129,6 +132,7 @@ This package contains developer documentation for %{name}.
 %patch01 -p1 -b .fix-64bit-acinclude
 %patch02 -p1 -b .maildir-filters
 %patch03 -p1 -b .mh-leak
+%patch04 -p1 -b .authmethod
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -361,6 +365,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Nov 16 2012 Milan Crha <mcrha at redhat.com> - 3.4.4-4
+- Add patch for Red Hat bug #814341 (crash in ldap's authenticate_user)
+
 * Thu Sep 13 2012 Milan Crha <mcrha at redhat.com> - 3.4.4-3
 - Add patch for Red Hat bug #842099 (memory leak in MH-format camel provider)
 


More information about the scm-commits mailing list