httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r555470 - in /httpd/httpd/trunk: include/util_ldap.h modules/aaa/mod_authnz_ldap.c modules/ldap/util_ldap.c
Date Thu, 12 Jul 2007 02:42:44 GMT
Author: covener
Date: Wed Jul 11 19:42:44 2007
New Revision: 555470

URL: http://svn.apache.org/viewvc?view=rev&rev=555470
Log:
This data is passed in an unsafe way to the LDAP SDK if the compiler 
chooses to use shorts for the enum values.
http://www.redbooks.ibm.com/redbooks/SG245992/nn4/SG245992_88.html

Submitted by: David Jones

Modified:
    httpd/httpd/trunk/include/util_ldap.h
    httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_ldap.h?view=diff&rev=555470&r1=555469&r2=555470
==============================================================================
--- httpd/httpd/trunk/include/util_ldap.h (original)
+++ httpd/httpd/trunk/include/util_ldap.h Wed Jul 11 19:42:44 2007
@@ -96,7 +96,7 @@
 
     const char *host;                   /* Name of the LDAP server (or space separated list)
*/
     int port;                           /* Port of the LDAP server */
-    deref_options deref;                /* how to handle alias dereferening */
+    int deref;                          /* how to handle alias dereferening */
 
     const char *binddn;                 /* DN to bind to server (can be NULL) */
     const char *bindpw;                 /* Password to bind to server (can be NULL) */
@@ -206,11 +206,11 @@
  *      use this connection while it is busy. Once you are finished with a connection,
  *      apr_ldap_connection_close() must be called to release this connection.
  * @fn util_ldap_connection_t *util_ldap_connection_find(request_rec *r, const char *host,
int port,
- *                                                           const char *binddn, const char
*bindpw, deref_options deref,
+ *                                                           const char *binddn, const char
*bindpw, int deref,
  *                                                           int netscapessl, int starttls)
  */
 APR_DECLARE_OPTIONAL_FN(util_ldap_connection_t *,uldap_connection_find,(request_rec *r, const
char *host, int port,
-                                                  const char *binddn, const char *bindpw,
deref_options deref,
+                                                  const char *binddn, const char *bindpw,
int deref,
                                                   int secure));
 
 /**

Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?view=diff&rev=555470&r1=555469&r2=555470
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Wed Jul 11 19:42:44 2007
@@ -57,7 +57,7 @@
     char **attributes;              /* Array of all the attributes to return */
     int scope;                      /* Scope of the search */
     char *filter;                   /* Filter to further limit the search  */
-    deref_options deref;            /* how to handle alias dereferening */
+    int deref;                      /* how to handle alias dereferening */
     char *binddn;                   /* DN to bind to server (can be NULL) */
     char *bindpw;                   /* Password to bind to server (can be NULL) */
 

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?view=diff&rev=555470&r1=555469&r2=555470
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Wed Jul 11 19:42:44 2007
@@ -448,7 +448,7 @@
             uldap_connection_find(request_rec *r,
                                   const char *host, int port,
                                   const char *binddn, const char *bindpw,
-                                  deref_options deref, int secure)
+                                  int deref, int secure)
 {
     struct util_ldap_connection_t *l, *p; /* To traverse the linked list */
     int secureflag = secure;



Mime
View raw message