Revert r1129886: (f96669de) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

include/ap_ldap.h.in

+14 −18

Original line number	Diff line number	Diff line
		@@ -30,27 +30,23 @@
		* @{
		*/

		/* Create a set of LDAP_DECLARE macros with appropriate export
		* and import tags for the platform
		*/
		#if !defined(WIN32)
		#define LDAP_DECLARE(type) type
		#define LDAP_DECLARE_NONSTD(type) type
		#define LDAP_DECLARE_DATA
		#elif defined(LDAP_DECLARE_STATIC)
		#define LDAP_DECLARE(type) type __stdcall
		#define LDAP_DECLARE_NONSTD(type) type
		#define LDAP_DECLARE_DATA
		#elif defined(LDAP_DECLARE_EXPORT)
		#define LDAP_DECLARE(type) __declspec(dllexport) type __stdcall
		#define LDAP_DECLARE_NONSTD(type) __declspec(dllexport) type
		#define LDAP_DECLARE_DATA __declspec(dllexport)
		#define MODLDAP_DECLARE(type) type
		#define MODLDAP_DECLARE_NONSTD(type) type
		#define MODLDAP_DECLARE_DATA
		#elif defined(MODLDAP_DECLARE_STATIC)
		#define MODLDAP_DECLARE(type) type __stdcall
		#define MODLDAP_DECLARE_NONSTD(type) type
		#define MODLDAP_DECLARE_DATA
		#elif defined(MODLDAP_DECLARE_EXPORT)
		#define MODLDAP_DECLARE(type) __declspec(dllexport) type __stdcall
		#define MODLDAP_DECLARE_NONSTD(type) __declspec(dllexport) type
		#define MODLDAP_DECLARE_DATA __declspec(dllexport)
		#else
		#define LDAP_DECLARE(type) __declspec(dllimport) type __stdcall
		#define LDAP_DECLARE_NONSTD(type) __declspec(dllimport) type
		#define LDAP_DECLARE_DATA __declspec(dllimport)
		#define MODLDAP_DECLARE(type) __declspec(dllimport) type __stdcall
		#define MODLDAP_DECLARE_NONSTD(type) __declspec(dllimport) type
		#define MODLDAP_DECLARE_DATA __declspec(dllimport)
		#endif

		/* this will be defined if LDAP support was compiled into apr-util */
		#define AP_HAS_LDAP @ap_has_ldap@

include/ap_ldap_init.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ extern "C" {


		/**
		* LDAP SSL Initialise function
		* MODLDAP SSL Initialise function
		*
		* This function initialises SSL on the underlying LDAP toolkit
		* if this is necessary.
		@@ -86,13 +86,13 @@ extern "C" {
		* ap_ldap_set_option() AP_LDAP_OPT_TLS_CERT option for details.
		* @param result_err The returned result
		*/
		LDAP_DECLARE(int) ap_ldap_ssl_init(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_ssl_init(apr_pool_t *pool,
		const char *cert_auth_file,
		int cert_file_type,
		ap_ldap_err_t **result_err);

		/**
		* LDAP SSL De-Initialise function
		* MODLDAP SSL De-Initialise function
		*
		* This function tears down any SSL certificate setup previously
		* set using ap_ldap_ssl_init(). It should be called to clean
		@@ -100,10 +100,10 @@ LDAP_DECLARE(int) ap_ldap_ssl_init(apr_pool_t *pool,
		* @todo currently we do not check whether ap_ldap_ssl_init()
		* has been called first - we probably should.
		*/
		LDAP_DECLARE(int) ap_ldap_ssl_deinit(void);
		MODLDAP_DECLARE(int) ap_ldap_ssl_deinit(void);

		/**
		* LDAP initialise function
		* MODLDAP initialise function
		*
		* This function is responsible for initialising an LDAP
		* connection in a toolkit independant way. It does the
		@@ -136,7 +136,7 @@ LDAP_DECLARE(int) ap_ldap_ssl_deinit(void);
		* @param secure The security mode to set
		* @param result_err The returned result
		*/
		LDAP_DECLARE(int) ap_ldap_init(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_init(apr_pool_t *pool,
		LDAP **ldap,
		const char *hostname,
		int portno,
		@@ -144,14 +144,14 @@ LDAP_DECLARE(int) ap_ldap_init(apr_pool_t *pool,
		ap_ldap_err_t **result_err);

		/**
		* LDAP info function
		* MODLDAP info function
		*
		* This function returns a string describing the LDAP toolkit
		* currently in use. The string is placed inside result_err->reason.
		* @param pool The pool to use
		* @param result_err The returned result
		*/
		LDAP_DECLARE(int) ap_ldap_info(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_info(apr_pool_t *pool,
		ap_ldap_err_t **result_err);

		#ifdef __cplusplus

include/ap_ldap_option.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		/**
		* @file ap_ldap_option.h
		* @brief LDAP ldap_*_option() functions
		* @brief MODLDAP ldap_*_option() functions
		*/
		#ifndef AP_LDAP_OPTION_H
		#define AP_LDAP_OPTION_H
		@@ -203,7 +203,7 @@ struct ap_ldap_opt_tls_cert_t {
		#define AP_LDAP_STOPTLS 3

		/**
		* LDAP get option function
		* MODLDAP get option function
		*
		* This function gets option values from a given LDAP session if
		* one was specified. It maps to the native ldap_get_option() function.
		@@ -214,14 +214,14 @@ struct ap_ldap_opt_tls_cert_t {
		* @param result_err The ap_ldap_err_t structure contained detailed results
		* of the operation.
		*/
		LDAP_DECLARE(int) ap_ldap_get_option(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_get_option(apr_pool_t *pool,
		LDAP *ldap,
		int option,
		void *outvalue,
		ap_ldap_err_t **result_err);

		/**
		* LDAP set option function
		* MODLDAP set option function
		*
		* This function sets option values to a given LDAP session if
		* one was specified. It maps to the native ldap_set_option() function.
		@@ -236,7 +236,7 @@ LDAP_DECLARE(int) ap_ldap_get_option(apr_pool_t *pool,
		* @param result_err The ap_ldap_err_t structure contained detailed results
		* of the operation.
		*/
		LDAP_DECLARE(int) ap_ldap_set_option(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_set_option(apr_pool_t *pool,
		LDAP *ldap,
		int option,
		const void *invalue,

include/ap_ldap_rebind.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/

		/**
		* The LDAP rebind functions provide an implementation of
		* The MODLDAP rebind functions provide an implementation of
		* a rebind procedure that can be used to allow clients to chase referrals,
		* using the same credentials used to log in originally.
		*
		@@ -43,16 +43,16 @@
		#if AP_HAS_LDAP

		/**
		* LDAP initialize rebind lock
		* MODLDAP initialize rebind lock
		*
		* This function creates the lock for controlling access to the xref list..
		* @param pool Pool to use when creating the xref_lock.
		*/
		LDAP_DECLARE(apr_status_t) ap_ldap_rebind_init(apr_pool_t *pool);
		MODLDAP_DECLARE(apr_status_t) ap_ldap_rebind_init(apr_pool_t *pool);


		/**
		* LDAP rebind_add function
		* MODLDAP rebind_add function
		*
		* This function creates a cross reference entry for the specified ldap
		* connection. The rebind callback function will look up this ldap
		@@ -72,13 +72,13 @@ LDAP_DECLARE(apr_status_t) ap_ldap_rebind_init(apr_pool_t *pool);
		* @param bindPW The bind Password to be used for any binds while
		* chasing referrals on this ldap connection.
		*/
		LDAP_DECLARE(apr_status_t) ap_ldap_rebind_add(apr_pool_t *pool,
		MODLDAP_DECLARE(apr_status_t) ap_ldap_rebind_add(apr_pool_t *pool,
		LDAP *ld,
		const char *bindDN,
		const char *bindPW);

		/**
		* LDAP rebind_remove function
		* MODLDAP rebind_remove function
		*
		* This function removes the rebind cross reference entry for the
		* specified ldap connection.
		@@ -88,7 +88,7 @@ LDAP_DECLARE(apr_status_t) ap_ldap_rebind_add(apr_pool_t *pool,
		*
		* @param ld The LDAP connectionhandle
		*/
		LDAP_DECLARE(apr_status_t) ap_ldap_rebind_remove(LDAP *ld);
		MODLDAP_DECLARE(apr_status_t) ap_ldap_rebind_remove(LDAP *ld);

		#endif /* AP_HAS_LDAP */

include/ap_ldap_url.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		/**
		* @file ap_ldap_url.h
		* @brief LDAP ldap_init() functions
		* @brief MODLDAP ldap_init() functions
		*/
		#ifndef AP_LDAP_URL_H
		#define AP_LDAP_URL_H
		@@ -71,19 +71,19 @@ typedef struct ap_ldap_url_desc_t {
		* Is this URL an ldap url? ldap://
		* @param url The url to test
		*/
		LDAP_DECLARE(int) ap_ldap_is_ldap_url(const char *url);
		MODLDAP_DECLARE(int) ap_ldap_is_ldap_url(const char *url);

		/**
		* Is this URL an SSL ldap url? ldaps://
		* @param url The url to test
		*/
		LDAP_DECLARE(int) ap_ldap_is_ldaps_url(const char *url);
		MODLDAP_DECLARE(int) ap_ldap_is_ldaps_url(const char *url);

		/**
		* Is this URL an ldap socket url? ldapi://
		* @param url The url to test
		*/
		LDAP_DECLARE(int) ap_ldap_is_ldapi_url(const char *url);
		MODLDAP_DECLARE(int) ap_ldap_is_ldapi_url(const char *url);

		/**
		* Parse an LDAP URL.
		@@ -92,7 +92,7 @@ LDAP_DECLARE(int) ap_ldap_is_ldapi_url(const char *url);
		* @param ludpp The structure to return the exploded URL
		* @param result_err The result structure of the operation
		*/
		LDAP_DECLARE(int) ap_ldap_url_parse_ext(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_url_parse_ext(apr_pool_t *pool,
		const char *url_in,
		ap_ldap_url_desc_t **ludpp,
		ap_ldap_err_t **result_err);
		@@ -104,7 +104,7 @@ LDAP_DECLARE(int) ap_ldap_url_parse_ext(apr_pool_t *pool,
		* @param ludpp The structure to return the exploded URL
		* @param result_err The result structure of the operation
		*/
		LDAP_DECLARE(int) ap_ldap_url_parse(apr_pool_t *pool,
		MODLDAP_DECLARE(int) ap_ldap_url_parse(apr_pool_t *pool,
		const char *url_in,
		ap_ldap_url_desc_t **ludpp,
		ap_ldap_err_t **result_err);