diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-24 11:56:08 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-03-16 10:54:50 +0100 |
| commit | fad0112373a9411c2a16eae03239aa0774a5e253 (patch) | |
| tree | f0006537edaaf725d5cae27eac432221587b6f35 /source3/include/includes.h | |
| parent | d19ea55e9e48ccb1ca63bfc0ec97f0ba7b26f7fd (diff) | |
| download | samba-fad0112373a9411c2a16eae03239aa0774a5e253.tar.gz samba-fad0112373a9411c2a16eae03239aa0774a5e253.tar.bz2 samba-fad0112373a9411c2a16eae03239aa0774a5e253.zip | |
s3-build: stop including ldap and lber headers everywhere in the code.
Instead use new header smb_ldap.h where all LDAP API related things are handled,
while smbldap.h only deals with our smbldap_X() API.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Mar 16 10:54:51 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 41483525fa..eafecb7fda 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -136,45 +136,7 @@ #undef HAVE_KRB5 #endif -#if HAVE_LBER_H -#include <lber.h> -#if defined(HPUX) && !defined(_LBER_TYPES_H) -/* Define ber_tag_t and ber_int_t for using - * HP LDAP-UX Integration products' LDAP libraries. -*/ -#ifndef ber_tag_t -typedef unsigned long ber_tag_t; -typedef int ber_int_t; -#endif -#endif /* defined(HPUX) && !defined(_LBER_TYPES_H) */ -#ifndef LBER_USE_DER -#define LBER_USE_DER 0x01 -#endif -#endif - -#if HAVE_LDAP_H -#include <ldap.h> -#ifndef LDAP_CONST -#define LDAP_CONST const -#endif -#ifndef LDAP_OPT_SUCCESS -#define LDAP_OPT_SUCCESS 0 -#endif -/* Solaris 8 and maybe other LDAP implementations spell this "..._INPROGRESS": */ -#if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS) -#define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS -#endif -/* Solaris 8 defines SSL_LDAP_PORT, not LDAPS_PORT and it only does so if - LDAP_SSL is defined - but SSL is not working. We just want the - port number! Let's just define LDAPS_PORT correct. */ -#if !defined(LDAPS_PORT) -#define LDAPS_PORT 636 -#endif - -/* function declarations not included in proto.h */ -LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); - -#else +#ifndef HAVE_LDAP_H #undef HAVE_LDAP #endif |