sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3-build: stop including ldap and lber headers everywhere in the code.

Browse Source 
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
This commit is contained in:
Günther Deschner 2011-02-24 11:56:08 +01:00
parent d19ea55e9e
commit fad0112373
8 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/ads.h
View File

@ -6,6 +6,8 @@
basically this is a wrapper around ldap
*/
#include "smb_ldap.h"
struct ads_struct;
struct ads_saslwrap_ops {

40
source3/include/includes.h
View File

@ -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

58
source3/include/smb_ldap.h Normal file
View File

@ -0,0 +1,58 @@
#ifndef _SMB_LDAP_H
#define _SMB_LDAP_H
#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 /* HAVE_LBER_H */
#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);
#endif /* HAVE_LDAP_H */
#ifndef HAVE_LDAP
#define LDAP void
#define LDAPMessage void
#define LDAPMod void
#define LDAP_CONST const
#define LDAPControl void
struct berval;
struct ldapsam_privates;
#endif /* HAVE_LDAP */
#ifndef LDAP_OPT_SUCCESS
#define LDAP_OPT_SUCCESS 0
#endif
#endif /* _SMB_LDAP_H */

14
source3/include/smbldap.h
View File

@ -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"
/*

1
source3/lib/ldap_debug_handler.c
View File

@ -18,6 +18,7 @@
*/
#include "includes.h"
#include "smb_ldap.h"
#if defined(HAVE_LDAP) && defined(HAVE_LBER_LOG_PRINT_FN)
static void samba_ldap_log_print_fn(LDAP_CONST char *data)

1
source3/libads/ads_status.c
View File

@ -22,6 +22,7 @@
#include "includes.h"
#include "smb_krb5.h"
#include "smb_ldap.h"
/*
build a ADS_STATUS structure

1
source3/libsmb/nterr.c
View File

@ -20,6 +20,7 @@
/* NT error codes. please read nterr.h */
#include "includes.h"
#include "smb_ldap.h"
#undef strcasecmp
#if !defined(N_)

1
source3/winbindd/winbindd.h
View File

@ -28,6 +28,7 @@
#include "librpc/gen_ndr/wbint.h"
#include "talloc_dict.h"
#include "smb_ldap.h"
#ifdef HAVE_LIBNSCD
#include <libnscd.h>