mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555470 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -96,7 +96,7 @@ typedef struct util_ldap_connection_t {
|
|||||||
|
|
||||||
const char *host; /* Name of the LDAP server (or space separated list) */
|
const char *host; /* Name of the LDAP server (or space separated list) */
|
||||||
int port; /* Port of the LDAP server */
|
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 *binddn; /* DN to bind to server (can be NULL) */
|
||||||
const char *bindpw; /* Password to bind to server (can be NULL) */
|
const char *bindpw; /* Password to bind to server (can be NULL) */
|
||||||
@@ -206,11 +206,11 @@ APR_DECLARE_OPTIONAL_FN(apr_status_t,uldap_connection_cleanup,(void *param));
|
|||||||
* use this connection while it is busy. Once you are finished with a connection,
|
* 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.
|
* 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,
|
* @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)
|
* int netscapessl, int starttls)
|
||||||
*/
|
*/
|
||||||
APR_DECLARE_OPTIONAL_FN(util_ldap_connection_t *,uldap_connection_find,(request_rec *r, const char *host, int port,
|
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));
|
int secure));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -57,7 +57,7 @@ typedef struct {
|
|||||||
char **attributes; /* Array of all the attributes to return */
|
char **attributes; /* Array of all the attributes to return */
|
||||||
int scope; /* Scope of the search */
|
int scope; /* Scope of the search */
|
||||||
char *filter; /* Filter to further limit 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 *binddn; /* DN to bind to server (can be NULL) */
|
||||||
char *bindpw; /* Password to bind to server (can be NULL) */
|
char *bindpw; /* Password to bind to server (can be NULL) */
|
||||||
|
|
||||||
|
@@ -448,7 +448,7 @@ static util_ldap_connection_t *
|
|||||||
uldap_connection_find(request_rec *r,
|
uldap_connection_find(request_rec *r,
|
||||||
const char *host, int port,
|
const char *host, int port,
|
||||||
const char *binddn, const char *bindpw,
|
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 */
|
struct util_ldap_connection_t *l, *p; /* To traverse the linked list */
|
||||||
int secureflag = secure;
|
int secureflag = secure;
|
||||||
|
Reference in New Issue
Block a user