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/smbldap.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/smbldap.h')
| -rw-r--r-- | source3/include/smbldap.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 3427ab54f6..7872ce4d4b 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -23,6 +23,8 @@ struct smbldap_state; +#include "smb_ldap.h" + #ifdef HAVE_LDAP /* specify schema versions between 2.2. and 3.0 */ @@ -277,24 +279,12 @@ NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state, LDAPMessage ** result, const char *domain_name, bool try_add); -#else -#define LDAP void -#define LDAPMessage void -#define LDAPMod void -#define LDAP_CONST const -#define LDAPControl void -struct berval; -struct ldapsam_privates; #endif /* HAVE_LDAP */ #define LDAP_DEFAULT_TIMEOUT 15 #define LDAP_CONNECTION_DEFAULT_TIMEOUT 2 #define LDAP_PAGE_SIZE 1024 -#ifndef LDAP_OPT_SUCCESS -#define LDAP_OPT_SUCCESS 0 -#endif - #define ADS_PAGE_CTL_OID "1.2.840.113556.1.4.319" /* |