37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
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
|