diff options
Diffstat (limited to 'lib/ldap.c')
| -rw-r--r-- | lib/ldap.c | 42 |
1 files changed, 23 insertions, 19 deletions
@@ -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 * you should have received as part of this distribution. The terms @@ -22,7 +22,19 @@ #include "setup.h" -#ifndef CURL_DISABLE_LDAP +#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 -- */ #include <stdio.h> #include <string.h> @@ -31,15 +43,7 @@ #include <ctype.h> #include <errno.h> -#ifdef CURL_LDAP_HYBRID /* If W$ definitions are needed. */ -# include <windows.h> - /* Remember we are NOT in a W$ compiler! */ -# undef WIN32 -# undef _WIN32 -# undef __WIN32__ -#endif - -#ifdef CURL_LDAP_WIN /* Use W$ LDAP implementation. */ +#ifdef CURL_LDAP_WIN /* Use Windows LDAP implementation. */ # include <winldap.h> # ifndef LDAP_VENDOR_NAME # error Your Platform SDK is NOT sufficient for LDAP support! Update your Platform SDK, or disable LDAP support! @@ -47,14 +51,14 @@ # include <winber.h> # endif #else -#define LDAP_DEPRECATED 1 /* Be sure ldap_init() is defined. */ -#ifdef HAVE_LBER_H -# include <lber.h> -#endif +# define LDAP_DEPRECATED 1 /* Be sure ldap_init() is defined. */ +# ifdef HAVE_LBER_H +# include <lber.h> +# endif # include <ldap.h> -#if (defined(HAVE_LDAP_SSL) && defined(HAVE_LDAP_SSL_H)) -# include <ldap_ssl.h> -#endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ +# if (defined(HAVE_LDAP_SSL) && defined(HAVE_LDAP_SSL_H)) +# include <ldap_ssl.h> +# endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ #endif #ifdef HAVE_UNISTD_H @@ -715,4 +719,4 @@ static void _ldap_free_urldesc (LDAPURLDesc *ludp) free (ludp); } #endif /* !HAVE_LDAP_URL_PARSE */ -#endif /* CURL_DISABLE_LDAP */ +#endif /* !CURL_DISABLE_LDAP && !USE_OPENLDAP */ |