svn commit: samba r5305 - in branches/SAMBA_4_0/source: include
ldap_server libcli/ldap torture/ldap
tridge at samba.org
tridge at samba.org
Thu Feb 10 07:08:40 GMT 2005
Author: tridge
Date: 2005-02-10 07:08:40 +0000 (Thu, 10 Feb 2005)
New Revision: 5305
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5305
Log:
removed libcli/ldap/ldap.h from includes.h
Modified:
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/include/structs.h
branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
branches/SAMBA_4_0/source/ldap_server/ldap_bind.c
branches/SAMBA_4_0/source/ldap_server/ldap_server.h
branches/SAMBA_4_0/source/libcli/ldap/config.mk
branches/SAMBA_4_0/source/libcli/ldap/ldap.c
branches/SAMBA_4_0/source/libcli/ldap/ldap.h
branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
branches/SAMBA_4_0/source/libcli/ldap/ldap_ldif.c
branches/SAMBA_4_0/source/torture/ldap/basic.c
branches/SAMBA_4_0/source/torture/ldap/common.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/include/includes.h 2005-02-10 07:08:40 UTC (rev 5305)
@@ -122,7 +122,6 @@
#include "enums.h"
#include "smb_macros.h"
#include "smb.h"
-#include "libcli/ldap/ldap.h"
#include "byteorder.h"
#include "module.h"
#include "mutex.h"
Modified: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:08:40 UTC (rev 5305)
@@ -74,6 +74,8 @@
struct ldapsrv_call;
struct ldapsrv_connection;
+struct ldap_connection;
+struct ldap_message;
struct rw_buffer;
struct registry_context;
struct registry_key;
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -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 @@
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) {
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_bind.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_bind.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_bind.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -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)
{
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.h
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2005-02-10 07:08:40 UTC (rev 5305)
@@ -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;
Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2005-02-10 07:08:40 UTC (rev 5305)
@@ -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
#################################
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -27,6 +27,7 @@
#include "system/iconv.h"
#include "system/filesys.h"
#include "asn_1.h"
+#include "libcli/ldap/ldap.h"
/****************************************************************************
*
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.h 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.h 2005-02-10 07:08:40 UTC (rev 5305)
@@ -317,4 +317,63 @@
#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
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -29,6 +29,7 @@
#include "auth/auth.h"
#include "asn_1.h"
#include "dlinklist.h"
+#include "libcli/ldap/ldap.h"
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_ldif.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_ldif.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_ldif.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -25,6 +25,7 @@
#include "includes.h"
#include "system/iconv.h"
+#include "libcli/ldap/ldap.h"
/****************************************************************************
*
Modified: branches/SAMBA_4_0/source/torture/ldap/basic.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/basic.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/torture/ldap/basic.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -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)
{
Modified: branches/SAMBA_4_0/source/torture/ldap/common.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/common.c 2005-02-10 06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/torture/ldap/common.c 2005-02-10 07:08:40 UTC (rev 5305)
@@ -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)
{
More information about the samba-cvs
mailing list