Commit fe54a7ea authored by Paul J. Reder's avatar Paul J. Reder
Browse files

Commit promoted backport of PR 45994. 

  *) mod_ldap: Avoid a segfault when result->rc is checked in uldap_connection_init
     when result is NULL. This could happen if LDAP initialization failed.
     PR 45994.  [Dan Poirier <poirier pobox.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@727773 13f79535-47bb-0310-9956-ffa450edef68
parent 4a6313a0

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.12



  *) mod_ldap: Avoid a segfault when result->rc is checked in uldap_connection_init

     when result is NULL. This could happen if LDAP initialization failed.

     PR 45994.  [Dan Poirier <poirier pobox.com>]



  *) Set Listen protocol to "https" if port is set to 443 and no proto is specified

     (as documented but not implemented). PR 46066  [Dan Poirier <poirier pobox.com>]

STATUS

+0 −9
Changes for STATUS: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -86,15 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



 * mod_ldap: Avoid a segfault when result->rc is checked in uldap_connection_init

   when result is NULL. This could happen if LDAP initialization failed.

   PR 45994.  [Dan Poirier <poirier pobox.com>]

   Trunk version of patch:

      http://svn.apache.org/viewvc?view=rev&revision=727053

   Backport version for 2.2.x of patch:

      http://people.apache.org/~rederpj/backport_PR45994_util_ldap.c.diff

   +1: rederpj, rpluem, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/ldap/util_ldap.c

+10 −1
Changes for modules/ldap/util_ldap.c: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -232,7 +232,16 @@ static int uldap_connection_init(request_rec *r, 
                  &(result));





    if (result != NULL && result->rc) {

    if (NULL == result) {

        /* something really bad happened */

        ldc->bound = 0;

        if (NULL == ldc->reason) {

            ldc->reason = "LDAP: ldap initialization failed";

        }

        return(APR_EGENERAL);

    }



    if (result->rc) {

        ldc->reason = result->reason;

    }