Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 18081 invoked from network); 19 Jul 2007 21:06:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jul 2007 21:06:07 -0000 Received: (qmail 34203 invoked by uid 500); 19 Jul 2007 21:05:40 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 34166 invoked by uid 500); 19 Jul 2007 21:05:40 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 34154 invoked by uid 99); 19 Jul 2007 21:05:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2007 14:05:40 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2007 14:05:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D38561A981A; Thu, 19 Jul 2007 14:05:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r557772 - in /httpd/httpd/trunk: include/util_ldap.h modules/aaa/mod_authnz_ldap.c modules/ldap/util_ldap.c Date: Thu, 19 Jul 2007 21:05:17 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070719210517.D38561A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: covener Date: Thu Jul 19 14:05:16 2007 New Revision: 557772 URL: http://svn.apache.org/viewvc?view=rev&rev=557772 Log: revert revision 555470 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=557772&r1=557771&r2=557772 ============================================================================== --- httpd/httpd/trunk/include/util_ldap.h (original) +++ httpd/httpd/trunk/include/util_ldap.h Thu Jul 19 14:05:16 2007 @@ -96,7 +96,7 @@ 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 @@ * 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)); /** 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=557772&r1=557771&r2=557772 ============================================================================== --- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original) +++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Thu Jul 19 14:05:16 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 */ - 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) */ 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=557772&r1=557771&r2=557772 ============================================================================== --- httpd/httpd/trunk/modules/ldap/util_ldap.c (original) +++ httpd/httpd/trunk/modules/ldap/util_ldap.c Thu Jul 19 14:05:16 2007 @@ -441,7 +441,7 @@ 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;