sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

r5305: removed libcli/ldap/ldap.h from includes.h

Browse Source
This commit is contained in:
Andrew Tridgell 2005-02-10 07:08:40 +00:00 committed by Gerald (Jerry) Carter
parent b902ea546d
commit 0df3fdd817
12 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/include/includes.h
View File

@ -122,7 +122,6 @@ extern int errno;
#include "enums.h"
#include "smb_macros.h"
#include "smb.h"
#include "libcli/ldap/ldap.h"
#include "byteorder.h"
#include "module.h"
#include "mutex.h"

2
source/include/structs.h
View File

@ -74,6 +74,8 @@ struct asn1_data;
struct ldapsrv_call;
struct ldapsrv_connection;
struct ldap_connection;
struct ldap_message;
struct rw_buffer;
struct registry_context;
struct registry_key;

5
source/ldap_server/ldap_backend.c
View File

@ -21,9 +21,10 @@
#include "includes.h"
#include "ldap_server/ldap_server.h"
#include "dlinklist.h"
#include "libcli/ldap/ldap.h"
struct ldapsrv_reply *ldapsrv_init_reply(struct ldapsrv_call *call, enum ldap_request_tag type)
struct ldapsrv_reply *ldapsrv_init_reply(struct ldapsrv_call *call, uint8_t type)
{
struct ldapsrv_reply *reply;
@ -47,7 +48,7 @@ NTSTATUS ldapsrv_queue_reply(struct ldapsrv_call *call, struct ldapsrv_reply *re
return NT_STATUS_OK;
}
struct ldapsrv_partition *ldapsrv_get_partition(struct ldapsrv_connection *conn, const char *dn, enum ldap_scope scope)
struct ldapsrv_partition *ldapsrv_get_partition(struct ldapsrv_connection *conn, const char *dn, uint8_t scope)
{
if (scope == LDAP_SEARCH_SCOPE_BASE
&& strcasecmp("", dn) == 0) {

1
source/ldap_server/ldap_bind.c
View File

@ -21,6 +21,7 @@
#include "includes.h"
#include "ldap_server/ldap_server.h"
#include "auth/auth.h"
#include "libcli/ldap/ldap.h"
static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
{

2
source/ldap_server/ldap_server.h
View File

@ -19,6 +19,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "libcli/ldap/ldap.h"
struct rw_buffer {
uint8_t *data;
size_t ofs, length;

1
source/libcli/ldap/config.mk
View File

@ -4,5 +4,6 @@
ADD_OBJ_FILES = libcli/ldap/ldap.o \
libcli/ldap/ldap_client.o \
libcli/ldap/ldap_ldif.o
NOPROTO=YES
# End SUBSYSTEM LIBCLI_LDAP
#################################

1
source/libcli/ldap/ldap.c
View File

@ -27,6 +27,7 @@
#include "system/iconv.h"
#include "system/filesys.h"
#include "asn_1.h"
#include "libcli/ldap/ldap.h"
/****************************************************************************
*

59
source/libcli/ldap/ldap.h
View File

@ -317,4 +317,63 @@ struct ldap_parse_tree {
#define LDAP_ALL_SEP "()&|=!"
#define LDAP_CONNECTION_TIMEOUT 10000
/* The following definitions come from libcli/ldap/ldap.c */
BOOL ldap_encode(struct ldap_message *msg, DATA_BLOB *result);
BOOL ldap_decode(struct asn1_data *data, struct ldap_message *msg);
BOOL ldap_parse_basic_url(TALLOC_CTX *mem_ctx, const char *url,
char **host, uint16_t *port, BOOL *ldaps);
/* The following definitions come from libcli/ldap/ldap_client.c */
struct ldap_connection *ldap_connect(TALLOC_CTX *mem_ctx, const char *url);
struct ldap_message *new_ldap_message(TALLOC_CTX *mem_ctx);
BOOL ldap_send_msg(struct ldap_connection *conn, struct ldap_message *msg,
const struct timeval *endtime);
BOOL ldap_receive_msg(struct ldap_connection *conn, struct ldap_message *msg,
const struct timeval *endtime);
struct ldap_message *ldap_receive(struct ldap_connection *conn, int msgid,
const struct timeval *endtime);
struct ldap_message *ldap_transaction(struct ldap_connection *conn,
struct ldap_message *request);
int ldap_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password);
int ldap_bind_sasl(struct ldap_connection *conn, const char *username, const char *domain, const char *password);
struct ldap_connection *ldap_setup_connection(TALLOC_CTX *mem_ctx, const char *url,
const char *userdn, const char *password);
struct ldap_connection *ldap_setup_connection_with_sasl(TALLOC_CTX *mem_ctx, const char *url,
const char *username, const char *domain, const char *password);
BOOL ldap_abandon_message(struct ldap_connection *conn, int msgid,
const struct timeval *endtime);
BOOL ldap_setsearchent(struct ldap_connection *conn, struct ldap_message *msg,
const struct timeval *endtime);
struct ldap_message *ldap_getsearchent(struct ldap_connection *conn,
const struct timeval *endtime);
void ldap_endsearchent(struct ldap_connection *conn,
const struct timeval *endtime);
struct ldap_message *ldap_searchone(struct ldap_connection *conn,
struct ldap_message *msg,
const struct timeval *endtime);
BOOL ldap_find_single_value(struct ldap_message *msg, const char *attr,
DATA_BLOB *value);
BOOL ldap_find_single_string(struct ldap_message *msg, const char *attr,
TALLOC_CTX *mem_ctx, char **value);
BOOL ldap_find_single_int(struct ldap_message *msg, const char *attr,
int *value);
int ldap_error(struct ldap_connection *conn);
NTSTATUS ldap2nterror(int ldaperror);
/* The following definitions come from libcli/ldap/ldap_ldif.c */
BOOL add_value_to_attrib(TALLOC_CTX *mem_ctx, struct ldap_val *value,
struct ldap_attribute *attrib);
BOOL add_attrib_to_array_talloc(TALLOC_CTX *mem_ctx,
const struct ldap_attribute *attrib,
struct ldap_attribute **attribs,
int *num_attribs);
BOOL add_mod_to_array_talloc(TALLOC_CTX *mem_ctx,
struct ldap_mod *mod,
struct ldap_mod **mods,
int *num_mods);
struct ldap_message *ldap_ldif2msg(TALLOC_CTX *mem_ctx, const char *s);
#endif

1
source/libcli/ldap/ldap_client.c
View File

@ -29,6 +29,7 @@
#include "auth/auth.h"
#include "asn_1.h"
#include "dlinklist.h"
#include "libcli/ldap/ldap.h"

1
source/libcli/ldap/ldap_ldif.c
View File

@ -25,6 +25,7 @@
#include "includes.h"
#include "system/iconv.h"
#include "libcli/ldap/ldap.h"
/****************************************************************************
*

1
source/torture/ldap/basic.c
View File

@ -22,6 +22,7 @@
*/
#include "includes.h"
#include "libcli/ldap/ldap.h"
BOOL test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password)
{

1
source/torture/ldap/common.c
View File

@ -23,6 +23,7 @@
#include "includes.h"
#include "asn_1.h"
#include "libcli/ldap/ldap.h"
NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, const char *password)
{