r14619 - in /desktop/unstable/gconf/debian: changelog patches/02_ldap_deprecated.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Feb 16 17:42:04 UTC 2008
Author: joss
Date: Sat Feb 16 17:42:04 2008
New Revision: 14619
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14619
Log:
* gconf-schemas: Work around hangs on kfreebsd/hurd. Thanks Samuel
* 02_ldap_deprecated.patch: replace deprecated LDAP functions by
currently working ones. Closes: #463370.
Added:
desktop/unstable/gconf/debian/patches/02_ldap_deprecated.patch
Modified:
desktop/unstable/gconf/debian/changelog
Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=14619&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog (original)
+++ desktop/unstable/gconf/debian/changelog Sat Feb 16 17:42:04 2008
@@ -1,10 +1,14 @@
-gconf (2.20.1-3) UNRELEASED; urgency=low
+gconf (2.20.1-3) unstable; urgency=low
[ Michael Banck ]
- * gconf-schemas: Work around hangs on kfreebsd/hurd. Thanks Samuel
+ * gconf-schemas: Work around hangs on kfreebsd/hurd. Thanks Samuel
Thibault.
- -- Michael Banck <mbanck at debian.org> Fri, 04 Jan 2008 18:31:39 +0100
+ [ Josselin Mouette ]
+ * 02_ldap_deprecated.patch: replace deprecated LDAP functions by
+ currently working ones. Closes: #463370.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 16 Feb 2008 18:38:00 +0100
gconf (2.20.1-2) unstable; urgency=low
Added: desktop/unstable/gconf/debian/patches/02_ldap_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/02_ldap_deprecated.patch?rev=14619&op=file
==============================================================================
--- desktop/unstable/gconf/debian/patches/02_ldap_deprecated.patch (added)
+++ desktop/unstable/gconf/debian/patches/02_ldap_deprecated.patch Sat Feb 16 17:42:04 2008
@@ -1,0 +1,67 @@
+--- backends/evoldap-backend.c.orig 2008-02-16 18:08:41.075271428 +0100
++++ backends/evoldap-backend.c 2008-02-16 18:36:12.863272803 +0100
+@@ -258,14 +258,14 @@
+ attr = ldap_first_attribute (connection, entry, &berptr);
+ while (attr != NULL && retval == NULL)
+ {
+- char **values;
++ struct berval **values;
+
+ if (strcmp (attr, varname) == 0)
+ {
+- values = ldap_get_values (connection, entry, attr);
+- if (values != NULL)
+- retval = g_strdup (values[0]);
+- ldap_value_free (values);
++ values = ldap_get_values_len (connection, entry, attr);
++ if (values != NULL && values[0] != NULL)
++ retval = g_strdup (values[0]->bv_val);
++ ldap_value_free_len (values);
+ }
+
+ attr = ldap_next_attribute (connection, entry, berptr);
+@@ -562,6 +562,7 @@
+ GError **err)
+ {
+ LDAP *connection;
++ char *url;
+
+ g_assert (esource->conf_file_parsed);
+
+@@ -578,13 +579,15 @@
+ _("Contacting LDAP server: host '%s', port '%d', base DN '%s'"),
+ esource->ldap_host, esource->ldap_port, esource->base_dn);
+
+- if ((connection = ldap_init (esource->ldap_host, esource->ldap_port)) == NULL)
++ url = g_strdup_printf ("ldap://%s:%i", esource->ldap_host, esource->ldap_port);
++ if (ldap_initialize (&connection, url) != LDAP_SUCCESS)
+ {
+ gconf_log (GCL_ERR,
+ _("Failed to contact LDAP server: %s"),
+ g_strerror (errno));
+ return NULL;
+ }
++ g_free (url);
+
+ esource->connection = connection;
+
+@@ -672,12 +675,13 @@
+ esource->filter_str);
+
+ entries = NULL;
+- ret = ldap_search_s (connection,
+- esource->base_dn,
+- LDAP_SCOPE_ONELEVEL,
+- esource->filter_str,
+- NULL, 0,
+- &entries);
++ ret = ldap_search_ext_s (connection,
++ esource->base_dn,
++ LDAP_SCOPE_ONELEVEL,
++ esource->filter_str,
++ NULL, 0,
++ NULL, NULL, NULL, 0,
++ &entries);
+ if (ret != LDAP_SUCCESS)
+ {
+ gconf_log (GCL_ERR,
More information about the pkg-gnome-commits
mailing list