apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r658648 - in /apr/apr-util/trunk: docs/ include/ ldap/
Date Wed, 21 May 2008 12:22:02 GMT
Author: wrowe
Date: Wed May 21 05:22:02 2008
New Revision: 658648

URL: http://svn.apache.org/viewvc?rev=658648&view=rev
Log:
Add new APU_DECLARE_LDAP macro to wrap the private build of these
functions once ldap is added to the modular DSO schema.  Also fixes
the missing apr_ldap_rebind.h to apr_ldap.h.


Modified:
    apr/apr-util/trunk/docs/doxygen.conf
    apr/apr-util/trunk/include/apr_ldap.h.in
    apr/apr-util/trunk/include/apr_ldap.hnw
    apr/apr-util/trunk/include/apr_ldap.hw
    apr/apr-util/trunk/include/apr_ldap_init.h
    apr/apr-util/trunk/include/apr_ldap_option.h
    apr/apr-util/trunk/include/apr_ldap_rebind.h
    apr/apr-util/trunk/ldap/apr_ldap_init.c
    apr/apr-util/trunk/ldap/apr_ldap_option.c
    apr/apr-util/trunk/ldap/apr_ldap_rebind.c

Modified: apr/apr-util/trunk/docs/doxygen.conf
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/docs/doxygen.conf?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/docs/doxygen.conf (original)
+++ apr/apr-util/trunk/docs/doxygen.conf Wed May 21 05:22:02 2008
@@ -14,6 +14,7 @@
 PREDEFINED="APU_DECLARE(x)=x" \
            "APU_DECLARE_NONSTD(x)=x" \
            "APU_DECLARE_DATA" \
+           "APU_DECLARE_LDAP(x)=x" \
            "APR_HAS_MMAP" \
            "APR_HAS_THREADS" \
            "APR_HAS_XLATE" \

Modified: apr/apr-util/trunk/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.h.in?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in (original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in Wed May 21 05:22:02 2008
@@ -153,6 +153,7 @@
 
 #define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
 
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"

Modified: apr/apr-util/trunk/include/apr_ldap.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.hnw?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hnw (original)
+++ apr/apr-util/trunk/include/apr_ldap.hnw Wed May 21 05:22:02 2008
@@ -126,9 +126,11 @@
 
 #define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
 
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
 
 /** @} */
 #endif /* APR_HAS_LDAP */

Modified: apr/apr-util/trunk/include/apr_ldap.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.hw?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hw (original)
+++ apr/apr-util/trunk/include/apr_ldap.hw Wed May 21 05:22:02 2008
@@ -134,9 +134,11 @@
 #define APR_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN)
 #endif
 
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
 
 /** @} */
 #endif /* APR_HAS_LDAP */

Modified: apr/apr-util/trunk/include/apr_ldap_init.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap_init.h?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_init.h (original)
+++ apr/apr-util/trunk/include/apr_ldap_init.h Wed May 21 05:22:02 2008
@@ -87,10 +87,10 @@
  * apr_ldap_set_option() APR_LDAP_OPT_TLS_CERT option for details.
  * @param result_err The returned result
  */
-APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
-                                   const char *cert_auth_file,
-                                   int cert_file_type,
-                                   apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool,
+                                        const char *cert_auth_file,
+                                        int cert_file_type,
+                                        apr_ldap_err_t **result_err);
 
 /**
  * APR LDAP SSL De-Initialise function
@@ -101,7 +101,7 @@
  * @todo currently we do not check whether apr_ldap_ssl_init()
  * has been called first - we probably should.
  */
-APU_DECLARE(int) apr_ldap_ssl_deinit(void);
+APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void);
 
 /**
  * APR LDAP initialise function
@@ -137,12 +137,12 @@
  * @param secure The security mode to set
  * @param result_err The returned result
  */
-APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
-                               LDAP **ldap,
-                               const char *hostname,
-                               int portno,
-                               int secure,
-                               apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool,
+                                    LDAP **ldap,
+                                    const char *hostname,
+                                    int portno,
+                                    int secure,
+                                    apr_ldap_err_t **result_err);
 
 /**
  * APR LDAP info function
@@ -152,8 +152,8 @@
  * @param pool The pool to use
  * @param result_err The returned result
  */
-APU_DECLARE(int) apr_ldap_info(apr_pool_t *pool,
-                               apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool,
+                                    apr_ldap_err_t **result_err);
 
 #ifdef __cplusplus
 }

Modified: apr/apr-util/trunk/include/apr_ldap_option.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap_option.h?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_option.h (original)
+++ apr/apr-util/trunk/include/apr_ldap_option.h Wed May 21 05:22:02 2008
@@ -215,11 +215,11 @@
  * @param result_err The apr_ldap_err_t structure contained detailed results
  *        of the operation.
  */
-APU_DECLARE(int) apr_ldap_get_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     void *outvalue,
-                                     apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          void *outvalue,
+                                          apr_ldap_err_t **result_err);
 
 /**
  * APR LDAP set option function
@@ -237,11 +237,11 @@
  * @param result_err The apr_ldap_err_t structure contained detailed results
  *        of the operation.
  */
-APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     const void *invalue,
-                                     apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          const void *invalue,
+                                          apr_ldap_err_t **result_err);
 
 #ifdef __cplusplus
 }

Modified: apr/apr-util/trunk/include/apr_ldap_rebind.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap_rebind.h?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_rebind.h (original)
+++ apr/apr-util/trunk/include/apr_ldap_rebind.h Wed May 21 05:22:02 2008
@@ -39,7 +39,7 @@
  * This function creates the lock for controlling access to the xref list..
  * @param pool Pool to use when creating the xref_lock.
  */
-APU_DECLARE(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool);
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool);
 
 
 /**
@@ -63,10 +63,10 @@
  * @param bindPW The bind Password to be used for any binds while 
  *               chasing referrals on this ldap connection.
  */
-APU_DECLARE(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool,
-                                              LDAP *ld,
-                                              const char *bindDN,
-                                              const char *bindPW);
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool,
+                                                   LDAP *ld,
+                                                   const char *bindDN,
+                                                   const char *bindPW);
 
 /**
  * APR LDAP rebind_remove function
@@ -79,7 +79,7 @@
  *
  * @param ld The LDAP connectionhandle
  */
-APU_DECLARE(apr_status_t) apr_ldap_rebind_remove(LDAP *ld);
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld);
 
 #endif /* APR_HAS_LDAP */
 

Modified: apr/apr-util/trunk/ldap/apr_ldap_init.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_init.c?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_init.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_init.c Wed May 21 05:22:02 2008
@@ -24,6 +24,12 @@
 
 #include "apr.h"
 #include "apu.h"
+#include "apu_config.h"
+
+#ifdef APU_DSO_BUILD
+#define APU_DSO_LDAP_BUILD
+#endif
+
 #include "apr_ldap.h"
 #include "apr_errno.h"
 #include "apr_pools.h"
@@ -49,10 +55,11 @@
  * will return APR_EGENERAL. Further LDAP specific error information
  * can be found in result_err.
  */
-APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
-                                   const char *cert_auth_file,
-                                   int cert_file_type,
-                                   apr_ldap_err_t **result_err) {
+APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool,
+                                        const char *cert_auth_file,
+                                        int cert_file_type,
+                                        apr_ldap_err_t **result_err)
+{
 
     apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t));
     *result_err = result;
@@ -105,7 +112,8 @@
  * @todo currently we do not check whether apr_ldap_ssl_init()
  * has been called first - should we?
  */
-APU_DECLARE(int) apr_ldap_ssl_deinit(void) {
+APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void)
+{
 
 #if APR_HAS_LDAP_SSL && APR_HAS_LDAPSSL_CLIENT_DEINIT
     ldapssl_client_deinit();
@@ -135,12 +143,13 @@
  * APR_LDAP_SSL: SSL encryption (ldaps://)
  * APR_LDAP_STARTTLS: Force STARTTLS on ldap://
  */
-APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
-                               LDAP **ldap,
-                               const char *hostname,
-                               int portno,
-                               int secure,
-                               apr_ldap_err_t **result_err) {
+APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool,
+                                    LDAP **ldap,
+                                    const char *hostname,
+                                    int portno,
+                                    int secure,
+                                    apr_ldap_err_t **result_err)
+{
 
     apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t));
     *result_err = result;
@@ -174,7 +183,8 @@
  * This function returns a string describing the LDAP toolkit
  * currently in use. The string is placed inside result_err->reason.
  */
-APU_DECLARE(int) apr_ldap_info(apr_pool_t *pool, apr_ldap_err_t **result_err)
+APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool,
+                                    apr_ldap_err_t **result_err)
 {
     apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t));
     *result_err = result;

Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_option.c?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c Wed May 21 05:22:02 2008
@@ -23,6 +23,12 @@
 
 #include "apr.h"
 #include "apu.h"
+#include "apu_config.h"
+
+#ifdef APU_DSO_BUILD
+#define APU_DSO_LDAP_BUILD
+#endif
+
 #include "apr_ldap.h"
 #include "apr_errno.h"
 #include "apr_pools.h"
@@ -42,11 +48,11 @@
  * This function gets option values from a given LDAP session if
  * one was specified.
  */
-APU_DECLARE(int) apr_ldap_get_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     void *outvalue,
-                                     apr_ldap_err_t **result_err)
+APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          void *outvalue,
+                                          apr_ldap_err_t **result_err)
 {
     apr_ldap_err_t *result;
 

Modified: apr/apr-util/trunk/ldap/apr_ldap_rebind.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_rebind.c?rev=658648&r1=658647&r2=658648&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_rebind.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_rebind.c Wed May 21 05:22:02 2008
@@ -23,6 +23,12 @@
 
 #include "apr.h"
 #include "apu.h"
+#include "apu_config.h"
+
+#ifdef APU_DSO_BUILD
+#define APU_DSO_LDAP_BUILD
+#endif
+
 #include "apr_ldap.h"
 #include "apr_errno.h"
 #include "apr_strings.h"
@@ -59,7 +65,7 @@
 static apr_status_t apr_ldap_rebind_remove_helper(void *data);
 
 /* APR utility routine used to create the xref_lock. */
-APU_DECLARE(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool)
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool)
 {
     apr_status_t retcode = APR_SUCCESS;
 
@@ -77,8 +83,10 @@
 }
 
 
-/*************************************************************************************/
-APU_DECLARE(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool, LDAP *ld, const char *bindDN,
const char *bindPW)
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool,
+                                                   LDAP *ld, 
+                                                   const char *bindDN, 
+                                                   const char *bindPW)
 {
     apr_status_t retcode = APR_SUCCESS;
     apr_ldap_rebind_entry_t *new_xref;
@@ -126,8 +134,8 @@
     return(APR_SUCCESS);
 }
 
-/*************************************************************************************/
-APU_DECLARE(apr_status_t) apr_ldap_rebind_remove(LDAP *ld)
+
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld)
 {
     apr_ldap_rebind_entry_t *tmp_xref, *prev = NULL;
 
@@ -166,6 +174,7 @@
     return APR_SUCCESS;
 }
 
+
 static apr_status_t apr_ldap_rebind_remove_helper(void *data)
 {
     LDAP *ld = (LDAP *)data;
@@ -173,7 +182,7 @@
     return APR_SUCCESS;
 }
 
-/*************************************************************************************/
+
 static apr_ldap_rebind_entry_t *apr_ldap_rebind_lookup(LDAP *ld)
 {
     apr_ldap_rebind_entry_t *tmp_xref, *match = NULL;



Mime
View raw message