← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to debian/patches/sasl-default-path

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek, Updated debconf translations
  • Date: 2009-07-28 10:17:15 UTC
  • mfrom: (1.1.4 upstream) (0.2.2 sid)
  • mto: (0.2.4 sid)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: james.westby@ubuntu.com-20090728101715-epwmqmsk0d3h22k3
http://bugs.debian.org/524770
http://bugs.debian.org/505191
http://bugs.debian.org/496749
http://bugs.debian.org/498116
http://bugs.debian.org/522965
http://bugs.debian.org/521804
* New upstream version.
  - Fixes FTBFS on ia64 with -fPIE. Closes: #524770.
  - Fixes some TLS issues with GnuTLS.  Closes: #505191.
* Update priority of libldap-2.4-2 to match the archive override.
* Add the missing ldapexop and ldapurl tools to ldap-utils, as well as the
  ldapurl(1) manpage.  Thanks to Peter Marschall for the patch.
  Closes: #496749.
* Bump build-dependency on debhelper to 6 instead of 5, since that's
  what we're using.  Closes: #498116.
* Set the default SLAPD_SERVICES to ldap:/// ldapi:///, instead of using
  the built-in default of ldap:/// only.
* Build-depend on libltdl-dev | libltdl3-dev (>= 1.4.3), for the package
  name change.  Closes: #522965.

[ Updated debconf translations ]
* Spanish, thanks to Francisco Javier Cuadrado <fcocuadrado@gmail.com>.
  Closes: #521804.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sasl-default-path
3
3
Not submitted upstream.  Somewhat Debian-specific and probably not of
4
4
interest upstream.
5
5
 
 
6
Index: openldap/include/ldap_defaults.h
 
7
===================================================================
6
8
--- openldap.orig/include/ldap_defaults.h
7
9
+++ openldap/include/ldap_defaults.h
8
10
@@ -63,4 +63,6 @@
12
14
+#define SASL_CONFIGPATH                        LDAP_SYSCONFDIR LDAP_DIRSEP "sasl2"
13
15
+
14
16
 #endif /* _LDAP_CONFIG_H */
 
17
Index: openldap/servers/slapd/sasl.c
 
18
===================================================================
15
19
--- openldap.orig/servers/slapd/sasl.c
16
20
+++ openldap/servers/slapd/sasl.c
17
 
@@ -1071,12 +1071,38 @@
 
21
@@ -1093,12 +1093,38 @@
18
22
 };
19
23
 #endif
20
24
 
50
54
        static sasl_callback_t server_callbacks[] = {
51
55
                { SASL_CB_LOG, &slap_sasl_log, NULL },
52
56
+               { SASL_CB_GETCONFPATH, &slap_sasl_getconfpath, NULL },
 
57
                { SASL_CB_GETOPT, &slap_sasl_getopt, NULL },
53
58
                { SASL_CB_LIST_END, NULL, NULL }
54
59
        };
55
 
 #endif