r4531: Include the OID locally, as it seems to be hard to get the includes

[samba.git] / source4 / ldap_server / ldap_server.h

diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h
index 591aa3affef1ac753f99c61dc393e5f5fd304a8f..6d4824bc9d86ffd75b66f28a5dcb8134f027a2a0 100644 (file)
--- a/source4/ldap_server/ldap_server.h
+++ b/source4/ldap_server/ldap_server.h
@@ -45,8 +45,6 @@ struct ldapsrv_call {
 
        struct ldapsrv_connection *conn;
 
-       const struct auth_session_info *session_info;
-
        struct ldap_message request;
 
        struct ldapsrv_reply {
@@ -61,8 +59,11 @@ struct ldapsrv_service;
 struct ldapsrv_connection {
        struct server_connection *connection;
 
-       struct gensec_security *gensec_ctx;
-       const struct auth_session_info *session_info;
+       struct gensec_security *gensec;
+       struct auth_session_info *session_info;
+
+       struct rw_buffer sasl_in_buffer;
+       struct rw_buffer sasl_out_buffer;
 
        struct rw_buffer in_buffer;
        struct rw_buffer out_buffer;
@@ -77,12 +78,10 @@ struct ldapsrv_partition;
 struct ldapsrv_partition_ops {
        const char *name;
        NTSTATUS (*Init)(struct ldapsrv_partition *partition, struct ldapsrv_connection *conn);
-       NTSTATUS (*Bind)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_BindRequest *r);
-       NTSTATUS (*Unbind)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_UnbindRequest *r);
        NTSTATUS (*Search)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_SearchRequest *r);
        NTSTATUS (*Modify)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyRequest *r);
        NTSTATUS (*Add)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_AddRequest *r);
-       NTSTATUS (*Delete)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_DeleteRequest *r);
+       NTSTATUS (*Del)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_DelRequest *r);
        NTSTATUS (*ModifyDN)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyDNRequest *r);
        NTSTATUS (*Compare)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_CompareRequest *r);
        NTSTATUS (*Abandon)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_AbandonRequest *r);