httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental util_ldap.c
Date Fri, 21 May 2004 20:02:40 GMT
minfrin     2004/05/21 13:02:40

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/experimental Tag: APACHE_2_0_BRANCH util_ldap.c
  Log:
  mod_ldap calls ldap_simple_bind_s() to validate the user
  credentials.  If the bind fails, the connection is left
  in an unbound state.  Make sure that the ldap connection
  record is updated to show that the connection is no longer
  bound.
  Reviewed by:	bnicholes, minfrin, jim
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.276 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.275
  retrieving revision 1.988.2.276
  diff -u -r1.988.2.275 -r1.988.2.276
  --- CHANGES	13 May 2004 23:40:02 -0000	1.988.2.275
  +++ CHANGES	21 May 2004 20:02:13 -0000	1.988.2.276
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.50
   
  +  *) mod_ldap calls ldap_simple_bind_s() to validate the user
  +     credentials.  If the bind fails, the connection is left
  +     in an unbound state.  Make sure that the ldap connection
  +     record is updated to show that the connection is no longer
  +     bound. [Brad Nicholes]
  +
     *) Ensure that lines in the request which are too long are 
        properly terminated before logging.
        [Tsurutani Naoki <turutani scphys.kyoto-u.ac.jp>]
  
  
  
  1.751.2.863 +1 -10     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.862
  retrieving revision 1.751.2.863
  diff -u -r1.751.2.862 -r1.751.2.863
  --- STATUS	21 May 2004 16:07:39 -0000	1.751.2.862
  +++ STATUS	21 May 2004 20:02:20 -0000	1.751.2.863
  @@ -123,15 +123,6 @@
          PR: 13511
          +1: jorton
   
  -    *) mod_ldap calls ldap_simple_bind_s() to validate the user
  -       credentials.  If the bind fails, the connection is left
  -       in an unbound state.  Make sure that the ldap connection
  -       record is updated to show that the connection is no longer
  -       bound.
  -       modules/experimental/util_ldap.c: r1.27
  -       +1: bnicholes, jim
  -       +1: minfrin (confirmed fixes long standing timeout bug)
  -        
       *) mod_ssl: Fix potential SEGV in 'shmcb' session cache.
          modules/ssl/ssl_scache_shmcb.c: r1.26
          +1: madhum, jorton
  
  
  
  No                   revision
  No                   revision
  1.6.2.14  +7 -3      httpd-2.0/modules/experimental/util_ldap.c
  
  Index: util_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap.c,v
  retrieving revision 1.6.2.13
  retrieving revision 1.6.2.14
  diff -u -r1.6.2.13 -r1.6.2.14
  --- util_ldap.c	26 Apr 2004 22:04:59 -0000	1.6.2.13
  +++ util_ldap.c	21 May 2004 20:02:39 -0000	1.6.2.14
  @@ -333,9 +333,6 @@
               break;
       }
   
  -    ldc->bound = 1;
  -    ldc->reason = "LDAP: connection open successful";
  -
       /* free the handle if there was an error
       */
       if (LDAP_SUCCESS != result)
  @@ -345,6 +342,10 @@
           ldc->bound = 0;
           ldc->reason = "LDAP: ldap_simple_bind_s() failed";
       }
  +	else {
  +		ldc->bound = 1;
  +		ldc->reason = "LDAP: connection open successful";
  +	}
   
       return(result);
   }
  @@ -875,6 +876,9 @@
       if (result != LDAP_SUCCESS) {
           ldc->reason = "ldap_simple_bind_s() to check user credentials failed";
           ldap_msgfree(res);
  +        ldap_unbind_s(ldc->ldap);
  +        ldc->ldap = NULL;
  +        ldc->bound = 0;
           return result;
       }
       else {
  
  
  

Mime
View raw message