~ius-coredev/ius/openldap24

« back to all changes in this revision

Viewing changes to SOURCES/openldap-cve-ndb-bind-rootdn.patch

  • Committer: Jeffrey Ness
  • Date: 2012-08-15 18:21:06 UTC
  • Revision ID: jeffrey.ness@rackspace.com-20120815182106-fifa0yp2oe0u3tsw
first

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
(CVE-2011-1025) CVE-2011-1025 openldap: rootpw is not verified with slapd.conf
 
2
 
 
3
Resolves: #680472 (tracker)
 
4
Upstream ITS: #6661
 
5
Upstream patch: http://www.openldap.org/devel/cvsweb.cgi/servers/slapd/back-ndb/bind.cpp.diff?r1=1.5&r2=1.8
 
6
 
 
7
diff -uNPrp openldap-2.4.23/servers/slapd/back-ndb/bind.cpp openldap-2.4.23.fix/servers/slapd/back-ndb/bind.cpp
 
8
--- openldap-2.4.23/servers/slapd/back-ndb/bind.cpp     2010-04-13 22:23:34.000000000 +0200
 
9
+++ openldap-2.4.23.fix/servers/slapd/back-ndb/bind.cpp 2011-02-28 15:05:48.014126213 +0100
 
10
@@ -43,11 +43,13 @@ ndb_back_bind( Operation *op, SlapReply 
 
11
 
 
12
        /* allow noauth binds */
 
13
        switch ( be_rootdn_bind( op, NULL ) ) {
 
14
-       case SLAP_CB_CONTINUE:
 
15
-               break;
 
16
+       case LDAP_SUCCESS:
 
17
+               /* frontend will send result */
 
18
+               return rs->sr_err = LDAP_SUCCESS;
 
19
 
 
20
        default:
 
21
-               return rs->sr_err;
 
22
+               /* give the database a chance */
 
23
+               break;
 
24
        }
 
25
 
 
26
        /* Get our NDB handle */