revert revision 555470

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557772 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/util_ldap.h b/include/util_ldap.h
index 94a41a6df7447a18b6b26949e1e9e2fe5e2bc7ee..d03e67fd66c1c7a9fd6ecef57f942faec1e98b6a 100644 (file)
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -96,7 +96,7 @@ typedef struct util_ldap_connection_t {
 
     const char *host;                   /* Name of the LDAP server (or space separated list) */
     int port;                           /* Port of the LDAP server */
-    int deref;                          /* how to handle alias dereferening */
+    deref_options 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 @@ 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,
  *      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, int deref,
+ *                                                           const char *binddn, const char *bindpw, deref_options 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, int deref,
+                                                  const char *binddn, const char *bindpw, deref_options deref,
                                                   int secure));
 
 /**

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 927a5ab133b997169903f6cebdcc1ff40a44a52d..38d83daff4903da5beef472f9f2b238330757f8b 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -57,7 +57,7 @@ typedef struct {
     char **attributes;              /* Array of all the attributes to return */
     int scope;                      /* Scope of the search */
     char *filter;                   /* Filter to further limit the search  */
-    int deref;                      /* how to handle alias dereferening */
+    deref_options 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) */
 

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index fc6409e679e0911f4b83b621e1686df0b5e452a7..459a0cdb01ac94b63d1e1803b2e10661a2f45347 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -441,7 +441,7 @@ static util_ldap_connection_t *
             uldap_connection_find(request_rec *r,
                                   const char *host, int port,
                                   const char *binddn, const char *bindpw,
-                                  int deref, int secure)
+                                  deref_options deref, int secure)
 {
     struct util_ldap_connection_t *l, *p; /* To traverse the linked list */
     int secureflag = secure;