fix ldap related compilation issues (89da5324) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

configure.ac

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -411,6 +411,7 @@ AC_HELP_STRING([--disable-ldaps],[Disable LDAPS support]),
	else		else
	AC_MSG_RESULT(yes)		AC_MSG_RESULT(yes)
	AC_DEFINE(HAVE_LDAP_SSL, 1, [Use LDAPS implementation])		AC_DEFINE(HAVE_LDAP_SSL, 1, [Use LDAPS implementation])
			AC_SUBST(HAVE_LDAP_SSL, [1])
	curl_ldaps_msg="enabled"		curl_ldaps_msg="enabled"
	fi		fi
	;;		;;
	@@ -2701,12 +2702,15 @@ fi
	if test "x$CURL_DISABLE_TELNET" != "x1"; then		if test "x$CURL_DISABLE_TELNET" != "x1"; then
	SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS TELNET"		SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS TELNET"
	fi		fi
	if test "x$CURL_DISABLE_LDAP" != "x1" -o "x$USE_OPENLDAP" = "x1"; then		if test "x$CURL_DISABLE_LDAP" != "x1"; then
	SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAP"		SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAP"
	if test "x$CURL_DISABLE_LDAPS" != "x1" -o "x$USE_OPENLDAP$SSL_ENABLED" = "x11"; then		if test "x$CURL_DISABLE_LDAPS" != "x1"; then
			if (test "x$USE_OPENLDAP" = "x1" && test "x$SSL_ENABLED" = "x1") \|\|
			(test "x$USE_OPENLDAP" != "x1" && test "x$HAVE_LDAP_SSL" = "x1"); then
	SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAPS"		SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAPS"
	fi		fi
	fi		fi
			fi
	if test "x$CURL_DISABLE_DICT" != "x1"; then		if test "x$CURL_DISABLE_DICT" != "x1"; then
	SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS DICT"		SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS DICT"
	fi		fi

lib/curl_ldap.h

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@
	* \| (__\| \|_\| \| _ <\| \|___		* \| (__\| \|_\| \| _ <\| \|___
	* \___\|\___/\|_\| \_\_____\|		* \___\|\___/\|_\| \_\_____\|
	*		*
	* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.		* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
	*		*
	* This software is licensed as described in the file COPYING, which		* This software is licensed as described in the file COPYING, which
	* you should have received as part of this distribution. The terms		* you should have received as part of this distribution. The terms
	@@ -22,10 +22,11 @@
	* KIND, either express or implied.		* KIND, either express or implied.
	*		*
	***************************************************************************/		***************************************************************************/
	#if !defined(CURL_DISABLE_LDAP) \|\| defined(USE_OPENLDAP)		#ifndef CURL_DISABLE_LDAP
	extern const struct Curl_handler Curl_handler_ldap;		extern const struct Curl_handler Curl_handler_ldap;

	#if defined(HAVE_LDAP_SSL) \|\| defined(USE_OPENLDAP)		#if (defined(USE_OPENLDAP) && defined(USE_SSL)) \|\| \
			(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL))
	extern const struct Curl_handler Curl_handler_ldaps;		extern const struct Curl_handler Curl_handler_ldaps;
	#endif		#endif

lib/ldap.c

+14 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@
	* \| (__\| \|_\| \| _ <\| \|___		* \| (__\| \|_\| \| _ <\| \|___
	* \___\|\___/\|_\| \_\_____\|		* \___\|\___/\|_\| \_\_____\|
	*		*
	* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.		* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
	*		*
	* This software is licensed as described in the file COPYING, which		* This software is licensed as described in the file COPYING, which
	* you should have received as part of this distribution. The terms		* you should have received as part of this distribution. The terms
	@@ -23,6 +23,18 @@
	#include "setup.h"		#include "setup.h"

	#if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)		#if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)

			/*
			* Notice that USE_OPENLDAP is only a source code selection switch. When
			* libcurl is built with USE_OPENLDAP defined the libcurl source code that
			* gets compiled is the code from openldap.c, otherwise the code that gets
			* compiled is the code from ldap.c.
			*
			* When USE_OPENLDAP is defined a recent version of the OpenLDAP library
			* might be required for compilation and runtime. In order to use ancient
			* OpenLDAP library versions, USE_OPENLDAP shall not be defined.
			*/

	/* -- WIN32 approved -- */		/* -- WIN32 approved -- */
	#include <stdio.h>		#include <stdio.h>
	#include <string.h>		#include <string.h>
	@@ -715,4 +727,4 @@ static void _ldap_free_urldesc (LDAPURLDesc *ludp)
	free (ludp);		free (ludp);
	}		}
	#endif /* !HAVE_LDAP_URL_PARSE */		#endif /* !HAVE_LDAP_URL_PARSE */
	#endif /* CURL_DISABLE_LDAP */		#endif /* !CURL_DISABLE_LDAP && !USE_OPENLDAP */

lib/openldap.c

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,18 @@

	#include "setup.h"		#include "setup.h"

	#ifdef USE_OPENLDAP		#if !defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)

			/*
			* Notice that USE_OPENLDAP is only a source code selection switch. When
			* libcurl is built with USE_OPENLDAP defined the libcurl source code that
			* gets compiled is the code from openldap.c, otherwise the code that gets
			* compiled is the code from ldap.c.
			*
			* When USE_OPENLDAP is defined a recent version of the OpenLDAP library
			* might be required for compilation and runtime. In order to use ancient
			* OpenLDAP library versions, USE_OPENLDAP shall not be defined.
			*/

	#include "urldata.h"		#include "urldata.h"
	#include <curl/curl.h>		#include <curl/curl.h>
	@@ -588,4 +599,4 @@ static Sockbuf_IO ldapsb_tls =
	};		};
	#endif /* USE_SSL */		#endif /* USE_SSL */

	#endif /* USE_OPENLDAP */		#endif /* !CURL_DISABLE_LDAP && USE_OPENLDAP */

lib/url.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -181,9 +181,10 @@ static const struct Curl_handler * const protocols[] = {
	&Curl_handler_dict,		&Curl_handler_dict,
	#endif		#endif

	#if !defined(CURL_DISABLE_LDAP) \|\| defined(USE_OPENLDAP)		#ifndef CURL_DISABLE_LDAP
	&Curl_handler_ldap,		&Curl_handler_ldap,
	#if defined(HAVE_LDAP_SSL) \|\| (defined(USE_OPENLDAP) && defined(USE_SSL))		#if (defined(USE_OPENLDAP) && defined(USE_SSL)) \|\| \
			(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL))
	&Curl_handler_ldaps,		&Curl_handler_ldaps,
	#endif		#endif
	#endif		#endif