Merge lp:~james-page/ubuntu/lucid/openldap/fix-783836 into lp:ubuntu/lucid-updates/openldap

Proposed by James Page
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/lucid/openldap/fix-783836
Merge into: lp:ubuntu/lucid-updates/openldap
Diff against target: 51 lines (+31/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/series (+1/-0)
debian/patches/set.sock.err.to.EAGAIN.on.partial.write.patch (+21/-0)
To merge this branch: bzr merge lp:~james-page/ubuntu/lucid/openldap/fix-783836
Reviewer Review Type Date Requested Status
Dave Walker Pending
Review via email: mp+63254@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-16 10:15:30 +0000
3+++ debian/changelog 2011-06-02 15:54:35 +0000
4@@ -1,3 +1,12 @@
5+openldap (2.4.21-0ubuntu5.5) lucid-proposed; urgency=low
6+
7+ * Fix issue causing replication failures in SASL/GSSAPI configurations
8+ (LP: #783836).
9+ - debian/patches/set.sock.err.to.EAGAIN.on.partial.write.patch: upstream
10+ patch to provide better error handling for partial writes.
11+
12+ -- James Page <james.page@canonical.com> Fri, 20 May 2011 10:44:36 +0100
13+
14 openldap (2.4.21-0ubuntu5.4) lucid-security; urgency=low
15
16 * SECURITY UPDATE: fix successful anonymous bind via chain overlay when
17
18=== modified file 'debian/patches/series'
19--- debian/patches/series 2011-03-16 10:15:30 +0000
20+++ debian/patches/series 2011-06-02 15:54:35 +0000
21@@ -15,3 +15,4 @@
22 CVE-2011-1024
23 CVE-2011-1025
24 CVE-2011-1081
25+set.sock.err.to.EAGAIN.on.partial.write.patch
26
27=== added file 'debian/patches/set.sock.err.to.EAGAIN.on.partial.write.patch'
28--- debian/patches/set.sock.err.to.EAGAIN.on.partial.write.patch 1970-01-01 00:00:00 +0000
29+++ debian/patches/set.sock.err.to.EAGAIN.on.partial.write.patch 2011-06-02 15:54:35 +0000
30@@ -0,0 +1,21 @@
31+Decsription: Resolves issues with error handing for partial writes
32+ causing replication to stop working in SASL/GSSAPI configurations.
33+Origin: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commitdiff;h=f32f1a45d4e4f3259e33cedc3571c27787add409
34+Bug: http://www.openldap.org/its/index.cgi/Software%20Bugs?id=6639
35+Forwarded: not-needed
36+
37+Index: openldap/libraries/libldap/sasl.c
38+===================================================================
39+--- openldap.orig/libraries/libldap/sasl.c 2011-05-20 10:38:33.389372475 +0100
40++++ openldap/libraries/libldap/sasl.c 2011-05-20 10:38:45.189391837 +0100
41+@@ -733,8 +733,9 @@
42+ return ret;
43+ } else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
44+ /* partial write? pretend nothing got written */
45+- len2 = 0;
46+ p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE;
47++ sock_errset(EAGAIN);
48++ len2 = -1;
49+ }
50+
51+ /* return number of bytes encoded, not written, to ensure

Subscribers

People subscribed via source and target branches

to all changes: