17674N/A--- seahorse-2.28.0/pgp/seahorse-ldap-source.c.orig Fri Oct 16 14:25:16 2009

17674N/A+++ seahorse-2.28.0/pgp/seahorse-ldap-source.c Fri Oct 16 14:28:14 2009

17674N/A@@ -647,11 +647,8 @@

17674N/A

17674N/A {

17674N/A /* Now that we've resolved our address, connect via IP */

17674N/A- gchar *url;

17674N/A

17674N/A- url = g_strdup_printf ("ldap://%s:%u", soup_address_get_physical (lop->addr), port);

17674N/A- ldap_initialize (&(lop->ldap), url);

17674N/A- g_free (url);

17674N/A+ lop->ldap = ldap_init (soup_address_get_physical (lop->addr), port);

17674N/A g_return_if_fail (lop->ldap != NULL);

17674N/A }

17674N/A

17674N/A@@ -658,7 +655,7 @@

17674N/A #else /* WITH_SOUP */

17674N/A

17674N/A /* No async DNS resolve, let libldap handle resolving synchronously */

17674N/A- ldap_initialize (&(lop->ldap), server);

17674N/A+ lop->ldap = ldap_init (server, port);

17674N/A g_return_if_fail (lop->ldap != NULL);

17674N/A

17674N/A #endif /* WITH_SOUP */

17674N/A@@ -1465,7 +1462,7 @@

17674N/A g_return_val_if_fail (uri && *uri, FALSE);

17674N/A

17674N/A r = ldap_url_parse (uri, &url);

17674N/A- if (r == LDAP_URL_SUCCESS) {

17674N/A+ if (r == LDAP_SUCCESS) {

17674N/A

17674N/A /* Some checks to make sure it's a simple URI */

17674N/A if (!(url->lud_host && url->lud_host[0]) ||

17674N/A@@ -1476,7 +1473,7 @@

17674N/A ldap_free_urldesc (url);

17674N/A }

17674N/A

17674N/A- return r == LDAP_URL_SUCCESS;

17674N/A+ return r == LDAP_SUCCESS;

17674N/A }

17674N/A

17674N/A #endif /* WITH_LDAP */

17674N/A--- seahorse-2.28.1/pgp/seahorse-ldap-source.c.orig 2009-10-19 14:52:17.965690000 +0800

17674N/A+++ seahorse-2.28.1/pgp/seahorse-ldap-source.c 2009-10-19 14:59:23.734805000 +0800

17674N/A@@ -1460,8 +1460,11 @@

17674N/A int r;

17674N/A

17674N/A g_return_val_if_fail (uri && *uri, FALSE);

17674N/A-

17674N/A- r = ldap_url_parse (uri, &url);

17674N/A+

17674N/A+ if (strchr (uri, '\/') != strrchr (uri, '\/'))

17674N/A+ r = ldap_url_parse_nodn (uri, &url);

17674N/A+ else

17674N/A+ r = ldap_url_parse (uri, &url);

17674N/A if (r == LDAP_SUCCESS) {

17674N/A

17674N/A /* Some checks to make sure it's a simple URI */