rpms/evolution-data-server/devel evolution-data-server-2.22.0-e2k-global-catalog.patch, NONE, 1.1 evolution-data-server.spec, 1.210, 1.211

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.22.0-e2k-global-catalog.patch 
Log Message:

* Tue Mar 11 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.0-2.fc9
- Add patch for RH bug #296671 (GC servers may not support NTLM).


evolution-data-server-2.22.0-e2k-global-catalog.patch:

--- NEW FILE evolution-data-server-2.22.0-e2k-global-catalog.patch ---
diff -up evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c.e2k-global-catalog evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c
--- evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c.e2k-global-catalog	2007-11-29 07:53:45.000000000 -0500
+++ evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c	2008-03-11 23:41:22.000000000 -0400
@@ -307,17 +307,19 @@ static int
 connect_ldap (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap)
 {
 	int ldap_error;
-#ifndef HAVE_LDAP_NTLM_BIND
 	char *nt_name;
 #ifdef G_OS_WIN32
 	SEC_WINNT_AUTH_IDENTITY_W auth;
 #endif
-#endif
 
 	/* authenticate */
 #ifdef HAVE_LDAP_NTLM_BIND
-	ldap_error = ntlm_bind (gc, op, ldap);
-#else
+	if (ntlm_bind (gc, op, ldap) == LDAP_SUCCESS) {
+		E2K_GC_DEBUG_MSG(("GC: connected via NTLM\n\n"));
+		return LDAP_SUCCESS;
+	}
+#endif
+
 	nt_name = gc->priv->nt_domain ?
 		g_strdup_printf ("%s\\%s", gc->priv->nt_domain, gc->priv->user) :
 		g_strdup (gc->priv->user);
@@ -339,7 +341,7 @@ connect_ldap (E2kGlobalCatalog *gc, E2kO
 	g_free (auth.User);
 #endif
 	g_free (nt_name);
-#endif
+
 	if (ldap_error != LDAP_SUCCESS)
 		g_warning ("LDAP authentication failed (0x%02x)", ldap_error);
 	else


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- evolution-data-server.spec	10 Mar 2008 17:14:08 -0000	1.210
+++ evolution-data-server.spec	12 Mar 2008 04:11:03 -0000	1.211
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -55,6 +55,9 @@
 
 Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch
 
+# RH bug #296671 / GNOME bug #500389
+Patch16: evolution-data-server-2.22.0-e2k-global-catalog.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -134,6 +137,7 @@
 %patch13 -p1 -b .camel-folder-summary-crash
 %patch14 -p1 -b .fix-64bit-acinclude
 %patch15 -p1 -b .implicit-function-declaration
+%patch16 -p1 -b .e2k-global-catalog
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -376,6 +380,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Tue Mar 11 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.0-2.fc9
+- Add patch for RH bug #296671 (GC servers may not support NTLM).
+
 * Mon Mar 10 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.0-1.fc9
 - Update to 2.22.0