Rework service init functions to pass down service name. This is
[ira/wip.git] / source / ldap_server / ldap_server.c
index ebc232a4c83045b31050f0f502e0d5c67af409b1..f9c763eec781257f2f8d812bd5d07d8b10e86342 100644 (file)
@@ -1,12 +1,15 @@
 /* 
    Unix SMB/CIFS implementation.
+
    LDAP server
+
+   Copyright (C) Andrew Tridgell 2005
    Copyright (C) Volker Lendecke 2004
    Copyright (C) Stefan Metzmacher 2004
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "lib/events/events.h"
 #include "auth/auth.h"
-#include "dlinklist.h"
-#include "asn_1.h"
+#include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "lib/util/dlinklist.h"
+#include "lib/util/asn1.h"
 #include "ldap_server/ldap_server.h"
+#include "smbd/service_task.h"
 #include "smbd/service_stream.h"
-
+#include "smbd/service.h"
+#include "smbd/process_model.h"
+#include "lib/tls/tls.h"
+#include "lib/messaging/irpc.h"
+#include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
+#include "system/network.h"
+#include "lib/socket/netif.h"
+#include "dsdb/samdb/samdb.h"
+#include "param/param.h"
 /*
   close the socket and shutdown a server_context
 */
-static void ldapsrv_terminate_connection(struct ldapsrv_connection *ldap_conn, const char *reason)
-{
-       stream_terminate_connection(ldap_conn->connection, reason);
-}
-
-/* This rw-buf api is made to avoid memcpy. For now do that like mad...  The
-   idea is to write into a circular list of buffers where the ideal case is
-   that a read(2) holds a complete request that is then thrown away
-   completely. */
-
-void ldapsrv_consumed_from_buf(struct rw_buffer *buf,
-                                  size_t length)
+void ldapsrv_terminate_connection(struct ldapsrv_connection *conn, 
+                                        const char *reason)
 {
-       memmove(buf->data, buf->data+length, buf->length-length);
-       buf->length -= length;
+       stream_terminate_connection(conn->connection, reason);
 }
 
-static void peek_into_read_buf(struct rw_buffer *buf, uint8_t **out,
-                              size_t *out_length)
+/*
+  handle packet errors
+*/
+static void ldapsrv_error_handler(void *private, NTSTATUS status)
 {
-       *out = buf->data;
-       *out_length = buf->length;
+       struct ldapsrv_connection *conn = talloc_get_type(private, 
+                                                         struct ldapsrv_connection);
+       ldapsrv_terminate_connection(conn, nt_errstr(status));
 }
 
-BOOL ldapsrv_append_to_buf(struct rw_buffer *buf, uint8_t *data, size_t length)
+/*
+  process a decoded ldap message
+*/
+static void ldapsrv_process_message(struct ldapsrv_connection *conn,
+                                   struct ldap_message *msg)
 {
-       buf->data = realloc(buf->data, buf->length+length);
+       struct ldapsrv_call *call;
+       NTSTATUS status;
+       DATA_BLOB blob;
 
-       if (buf->data == NULL)
-               return False;
+       call = talloc(conn, struct ldapsrv_call);
+       if (!call) {
+               ldapsrv_terminate_connection(conn, "no memory");
+               return;         
+       }
+       
+       call->request = talloc_steal(call, msg);
+       call->conn = conn;
+       call->replies = NULL;
+       call->send_callback = NULL;
+       call->send_private = NULL;
+       
+       /* make the call */
+       status = ldapsrv_do_call(call);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(call);
+               return;
+       }
+       
+       blob = data_blob(NULL, 0);
 
-       memcpy(buf->data+buf->length, data, length);
+       if (call->replies == NULL) {
+               talloc_free(call);
+               return;
+       }
 
-       buf->length += length;
-       return True;
-}
+       /* build all the replies into a single blob */
+       while (call->replies) {
+               DATA_BLOB b;
+               bool ret;
 
-static BOOL read_into_buf(struct socket_context *sock, struct rw_buffer *buf)
-{
-       NTSTATUS status;
-       DATA_BLOB tmp_blob;
-       BOOL ret;
-       size_t nread;
+               msg = call->replies->msg;
+               if (!ldap_encode(msg, &b, call)) {
+                       DEBUG(0,("Failed to encode ldap reply of type %d\n", msg->type));
+                       talloc_free(call);
+                       return;
+               }
 
-       tmp_blob = data_blob_talloc(sock, NULL, 1024);
-       if (tmp_blob.data == NULL) {
-               return False;
-       }
+               ret = data_blob_append(call, &blob, b.data, b.length);
+               data_blob_free(&b);
 
-       status = socket_recv(sock, tmp_blob.data, tmp_blob.length, &nread, 0);
-       if (NT_STATUS_IS_ERR(status)) {
-               DEBUG(10,("socket_recv: %s\n",nt_errstr(status)));
-               talloc_free(tmp_blob.data);
-               return False;
-       }
-       tmp_blob.length = nread;
+               talloc_set_name_const(blob.data, "Outgoing, encoded LDAP packet");
 
-       ret = ldapsrv_append_to_buf(buf, tmp_blob.data, tmp_blob.length);
+               if (!ret) {
+                       talloc_free(call);
+                       return;
+               }
 
-       talloc_free(tmp_blob.data);
+               DLIST_REMOVE(call->replies, call->replies);
+       }
 
-       return ret;
+       packet_send_callback(conn->packet, blob, 
+                            call->send_callback, call->send_private);
+       talloc_free(call);
+       return;
 }
 
-static BOOL ldapsrv_read_buf(struct ldapsrv_connection *conn)
+/*
+  decode/process data
+*/
+static NTSTATUS ldapsrv_decode(void *private, DATA_BLOB blob)
 {
        NTSTATUS status;
-       DATA_BLOB tmp_blob;
-       DATA_BLOB wrapped;
-       DATA_BLOB unwrapped;
-       BOOL ret;
-       uint8_t *buf;
-       size_t buf_length, sasl_length;
-       struct socket_context *sock = conn->connection->socket;
-       TALLOC_CTX *mem_ctx;
-       size_t nread;
+       struct ldapsrv_connection *conn = talloc_get_type(private, 
+                                                         struct ldapsrv_connection);
+       struct asn1_data *asn1 = asn1_init(conn);
+       struct ldap_message *msg = talloc(conn, struct ldap_message);
 
-       if (!conn->gensec) {
-               return read_into_buf(sock, &conn->in_buffer);
-       }
-       if (!conn->session_info) {
-               return read_into_buf(sock, &conn->in_buffer);
-       }
-       if (!(gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) ||
-             gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL))) {
-               return read_into_buf(sock, &conn->in_buffer);
+       if (asn1 == NULL || msg == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       mem_ctx = talloc_new(conn);
-       if (!mem_ctx) {
-               DEBUG(0,("no memory\n"));
-               return False;
+       if (!asn1_load(asn1, blob)) {
+               talloc_free(msg);
+               talloc_free(asn1);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       tmp_blob = data_blob_talloc(mem_ctx, NULL, 1024);
-       if (tmp_blob.data == NULL) {
-               talloc_free(mem_ctx);
-               return False;
-       }
-
-       status = socket_recv(sock, tmp_blob.data, tmp_blob.length, &nread, 0);
-       if (NT_STATUS_IS_ERR(status)) {
-               DEBUG(10,("socket_recv: %s\n",nt_errstr(status)));
-               talloc_free(mem_ctx);
-               return False;
-       }
-       tmp_blob.length = nread;
-
-       ret = ldapsrv_append_to_buf(&conn->sasl_in_buffer, tmp_blob.data, tmp_blob.length);
-       if (!ret) {
-               talloc_free(mem_ctx);
-               return False;
+       status = ldap_decode(asn1, msg);
+       if (!NT_STATUS_IS_OK(status)) {
+               asn1_free(asn1);
+               return status;
        }
 
-       peek_into_read_buf(&conn->sasl_in_buffer, &buf, &buf_length);
-
-       if (buf_length < 4) {
-               /* not enough yet */
-               talloc_free(mem_ctx);
-               return True;
-       }
+       data_blob_free(&blob);
+       ldapsrv_process_message(conn, msg);
+       asn1_free(asn1);
+       return NT_STATUS_OK;
+}
 
-       sasl_length = RIVAL(buf, 0);
+/*
+ Idle timeout handler
+*/
+static void ldapsrv_conn_idle_timeout(struct event_context *ev,
+                                     struct timed_event *te,
+                                     struct timeval t,
+                                     void *private)
+{
+       struct ldapsrv_connection *conn = talloc_get_type(private, struct ldapsrv_connection);
 
-       if ((buf_length - 4) < sasl_length) {
-               /* not enough yet */
-               talloc_free(mem_ctx);
-               return True;
-       }
+       ldapsrv_terminate_connection(conn, "Timeout. No requests after bind");
+}
 
-       wrapped.data = buf + 4;
-       wrapped.length = sasl_length;
+/*
+  called when a LDAP socket becomes readable
+*/
+void ldapsrv_recv(struct stream_connection *c, uint16_t flags)
+{
+       struct ldapsrv_connection *conn = 
+               talloc_get_type(c->private, struct ldapsrv_connection);
 
-       status = gensec_unwrap(conn->gensec, mem_ctx,
-                              &wrapped, 
-                              &unwrapped);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("gensec_unwrap: %s\n",nt_errstr(status)));
-               talloc_free(mem_ctx);
-               return False;
+       if (conn->limits.ite) { /* clean initial timeout if any */
+               talloc_free(conn->limits.ite);
+               conn->limits.ite = NULL;
        }
 
-       ret = ldapsrv_append_to_buf(&conn->in_buffer, unwrapped.data, unwrapped.length);
-       if (!ret) {
-               talloc_free(mem_ctx);
-               return False;
+       if (conn->limits.te) { /* clean idle timeout if any */
+               talloc_free(conn->limits.te);
+               conn->limits.te = NULL;
        }
 
-       ldapsrv_consumed_from_buf(&conn->sasl_in_buffer, 4 + sasl_length);
+       packet_recv(conn->packet);
 
-       talloc_free(mem_ctx);
-       return ret;
+       /* set idle timeout */
+       conn->limits.te = event_add_timed(c->event.ctx, conn, 
+                                          timeval_current_ofs(conn->limits.conn_idle_time, 0),
+                                          ldapsrv_conn_idle_timeout, conn);
 }
 
-static BOOL write_from_buf(struct socket_context *sock, struct rw_buffer *buf)
+/*
+  called when a LDAP socket becomes writable
+*/
+static void ldapsrv_send(struct stream_connection *c, uint16_t flags)
 {
-       NTSTATUS status;
-       DATA_BLOB tmp_blob;
-       size_t sendlen;
-
-       tmp_blob.data = buf->data;
-       tmp_blob.length = buf->length;
-
-       status = socket_send(sock, &tmp_blob, &sendlen, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10,("socket_send() %s\n",nt_errstr(status)));
-               return False;
-       }
+       struct ldapsrv_connection *conn = 
+               talloc_get_type(c->private, struct ldapsrv_connection);
+       
+       packet_queue_run(conn->packet);
+}
 
-       ldapsrv_consumed_from_buf(buf, sendlen);
+static void ldapsrv_conn_init_timeout(struct event_context *ev,
+                                     struct timed_event *te,
+                                     struct timeval t,
+                                     void *private)
+{
+       struct ldapsrv_connection *conn = talloc_get_type(private, struct ldapsrv_connection);
 
-       return True;
+       ldapsrv_terminate_connection(conn, "Timeout. No requests after initial connection");
 }
 
-static BOOL ldapsrv_write_buf(struct ldapsrv_connection *conn)
+static int ldapsrv_load_limits(struct ldapsrv_connection *conn)
 {
-       NTSTATUS status;
-       DATA_BLOB wrapped;
-       DATA_BLOB tmp_blob;
-       DATA_BLOB sasl;
-       size_t sendlen;
-       BOOL ret;
-       struct socket_context *sock = conn->connection->socket;
-       TALLOC_CTX *mem_ctx;
+       TALLOC_CTX *tmp_ctx;
+       const char *attrs[] = { "configurationNamingContext", NULL };
+       const char *attrs2[] = { "lDAPAdminLimits", NULL };
+       struct ldb_message_element *el;
+       struct ldb_result *res = NULL;
+       struct ldb_dn *basedn;
+       struct ldb_dn *conf_dn;
+       struct ldb_dn *policy_dn;
+       int i,ret;
 
+       /* set defaults limits in case of failure */
+       conn->limits.initial_timeout = 120;
+       conn->limits.conn_idle_time = 900;
+       conn->limits.max_page_size = 1000;
+       conn->limits.search_timeout = 120;
 
-       if (!conn->gensec) {
-               return write_from_buf(sock, &conn->out_buffer);
-       }
-       if (!conn->session_info) {
-               return write_from_buf(sock, &conn->out_buffer);
-       }
-       if (!(gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) ||
-             gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL))) {
-               return write_from_buf(sock, &conn->out_buffer);
-       }
 
-       mem_ctx = talloc_new(conn);
-       if (!mem_ctx) {
-               DEBUG(0,("no memory\n"));
-               return False;
+       tmp_ctx = talloc_new(conn);
+       if (tmp_ctx == NULL) {
+               return -1;
        }
 
-       if (conn->out_buffer.length == 0) {
-               goto nodata;
+       basedn = ldb_dn_new(tmp_ctx, conn->ldb, NULL);
+       if ( ! ldb_dn_validate(basedn)) {
+               goto failed;
        }
 
-       tmp_blob.data = conn->out_buffer.data;
-       tmp_blob.length = conn->out_buffer.length;
-       status = gensec_wrap(conn->gensec, mem_ctx,
-                            &tmp_blob,
-                            &wrapped);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("gensec_wrap: %s\n",nt_errstr(status)));
-               talloc_free(mem_ctx);
-               return False;
-       }
-
-       sasl = data_blob_talloc(mem_ctx, NULL, 4 + wrapped.length);
-       if (!sasl.data) {
-               DEBUG(0,("no memory\n"));
-               talloc_free(mem_ctx);
-               return False;
+       ret = ldb_search(conn->ldb, basedn, LDB_SCOPE_BASE, NULL, attrs, &res);
+       if (ret != LDB_SUCCESS) {
+               goto failed;
        }
 
-       RSIVAL(sasl.data, 0, wrapped.length);
-       memcpy(sasl.data + 4, wrapped.data, wrapped.length);
+       talloc_steal(tmp_ctx, res);
 
-       ret = ldapsrv_append_to_buf(&conn->sasl_out_buffer, sasl.data, sasl.length);
-       if (!ret) {
-               talloc_free(mem_ctx);
-               return False;
+       if (res->count != 1) {
+               goto failed;
        }
-       ldapsrv_consumed_from_buf(&conn->out_buffer, conn->out_buffer.length);
-nodata:
-       tmp_blob.data = conn->sasl_out_buffer.data;
-       tmp_blob.length = conn->sasl_out_buffer.length;
 
-       status = socket_send(sock, &tmp_blob, &sendlen, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10,("socket_send() %s\n",nt_errstr(status)));
-               talloc_free(mem_ctx);
-               return False;
+       conf_dn = ldb_msg_find_attr_as_dn(conn->ldb, tmp_ctx, res->msgs[0], "configurationNamingContext");
+       if (conf_dn == NULL) {
+               goto failed;
        }
 
-       ldapsrv_consumed_from_buf(&conn->sasl_out_buffer, sendlen);
-
-       talloc_free(mem_ctx);
+       policy_dn = ldb_dn_copy(tmp_ctx, conf_dn);
+       ldb_dn_add_child_fmt(policy_dn, "CN=Default Query Policy,CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services");
+       if (policy_dn == NULL) {
+               goto failed;
+       }
 
-       return True;
-}
+       ret = ldb_search(conn->ldb, policy_dn, LDB_SCOPE_BASE, NULL, attrs2, &res);
+       if (ret != LDB_SUCCESS) {
+               goto failed;
+       }
 
-static BOOL ldap_encode_to_buf(struct ldap_message *msg, struct rw_buffer *buf)
-{
-       DATA_BLOB blob;
-       BOOL res;
+       talloc_steal(tmp_ctx, res);
 
-       if (!ldap_encode(msg, &blob))
-               return False;
+       if (res->count != 1) {
+               goto failed;
+       }
 
-       res = ldapsrv_append_to_buf(buf, blob.data, blob.length);
+       el = ldb_msg_find_element(res->msgs[0], "lDAPAdminLimits");
+       if (el == NULL) {
+               goto failed;
+       }
 
-       data_blob_free(&blob);
-       return res;
-}
+       for (i = 0; i < el->num_values; i++) {
+               char policy_name[256];
+               int policy_value, s;
 
-NTSTATUS ldapsrv_do_responses(struct ldapsrv_connection *conn)
-{
-       struct ldapsrv_call *call, *next_call = NULL;
-       struct ldapsrv_reply *reply, *next_reply = NULL;
-
-       for (call=conn->calls; call; call=next_call) {
-               for (reply=call->replies; reply; reply=next_reply) {
-                       if (!ldap_encode_to_buf(&reply->msg, &conn->out_buffer)) {
-                               return NT_STATUS_FOOBAR;
-                       }
-                       next_reply = reply->next;
-                       DLIST_REMOVE(call->replies, reply);
-                       reply->state = LDAPSRV_REPLY_STATE_SEND;
-                       talloc_free(reply);
+               s = sscanf((const char *)el->values[i].data, "%255[^=]=%d", policy_name, &policy_value);
+               if (ret != 2 || policy_value == 0)
+                       continue;
+               
+               if (strcasecmp("InitRecvTimeout", policy_name) == 0) {
+                       conn->limits.initial_timeout = policy_value;
+                       continue;
+               }
+               if (strcasecmp("MaxConnIdleTime", policy_name) == 0) {
+                       conn->limits.conn_idle_time = policy_value;
+                       continue;
+               }
+               if (strcasecmp("MaxPageSize", policy_name) == 0) {
+                       conn->limits.max_page_size = policy_value;
+                       continue;
+               }
+               if (strcasecmp("MaxQueryDuration", policy_name) == 0) {
+                       conn->limits.search_timeout = policy_value;
+                       continue;
                }
-               next_call = call->next;
-               DLIST_REMOVE(conn->calls, call);
-               call->state = LDAPSRV_CALL_STATE_COMPLETE;
-               talloc_free(call);
        }
 
-       return NT_STATUS_OK;
-}
+       return 0;
 
-NTSTATUS ldapsrv_flush_responses(struct ldapsrv_connection *conn)
-{
-       return NT_STATUS_OK;
+failed:
+       DEBUG(0, ("Failed to load ldap server query policies\n"));
+       talloc_free(tmp_ctx);
+       return -1;
 }
 
 /*
-  called when a LDAP socket becomes readable
+  initialise a server_context from a open socket and register a event handler
+  for reading from that socket
 */
-static void ldapsrv_recv(struct stream_connection *conn, uint16_t flags)
+static void ldapsrv_accept(struct stream_connection *c)
 {
-       struct ldapsrv_connection *ldap_conn = talloc_get_type(conn->private, struct ldapsrv_connection);
-       uint8_t *buf;
-       size_t buf_length, msg_length;
-       DATA_BLOB blob;
-       struct asn1_data data;
-       struct ldapsrv_call *call;
+       struct ldapsrv_service *ldapsrv_service = 
+               talloc_get_type(c->private, struct ldapsrv_service);
+       struct ldapsrv_connection *conn;
+       struct cli_credentials *server_credentials;
+       struct socket_address *socket_address;
        NTSTATUS status;
+       int port;
 
-       DEBUG(10,("ldapsrv_recv\n"));
-
-       if (!ldapsrv_read_buf(ldap_conn)) {
-               ldapsrv_terminate_connection(ldap_conn, "ldapsrv_read_buf() failed");
+       conn = talloc_zero(c, struct ldapsrv_connection);
+       if (!conn) {
+               stream_terminate_connection(c, "ldapsrv_accept: out of memory");
                return;
        }
 
-       peek_into_read_buf(&ldap_conn->in_buffer, &buf, &buf_length);
-
-       while (buf_length > 0) {
-               /* LDAP Messages are always SEQUENCES */
-
-               if (!asn1_object_length(buf, buf_length, ASN1_SEQUENCE(0),
-                                       &msg_length)) {
-                       ldapsrv_terminate_connection(ldap_conn, "asn1_object_length() failed");
-                       return;
-               }
+       conn->packet      = NULL;
+       conn->connection  = c;
+       conn->service     = ldapsrv_service;
+       conn->sockets.raw = c->socket;
+       conn->lp_ctx      = ldapsrv_service->task->lp_ctx;
 
-               if (buf_length < msg_length) {
-                       /* Not enough yet */
-                       break;
-               }
-
-               /* We've got a complete LDAP request in the in-buffer, convert
-                * that to a ldap_message and put it into the incoming
-                * queue. */
-
-               blob.data = buf;
-               blob.length = msg_length;
-
-               if (!asn1_load(&data, blob)) {
-                       ldapsrv_terminate_connection(ldap_conn, "asn1_load() failed");
-                       return;
-               }
+       c->private        = conn;
 
-               call = talloc(ldap_conn, struct ldapsrv_call);
-               if (!call) {
-                       ldapsrv_terminate_connection(ldap_conn, "no memory");
-                       return;         
-               }
-
-               ZERO_STRUCTP(call);
-               call->state = LDAPSRV_CALL_STATE_NEW;
-               call->conn = ldap_conn;
-               call->request.mem_ctx = call;
-
-               if (!ldap_decode(&data, &call->request)) {
-                       dump_data(0,buf, msg_length);
-                       asn1_free(&data);
-                       ldapsrv_terminate_connection(ldap_conn, "ldap_decode() failed");
-                       return;
-               }
-
-               asn1_free(&data);
-
-               DLIST_ADD_END(ldap_conn->calls, call,
-                             struct ldapsrv_call *);
-
-               ldapsrv_consumed_from_buf(&ldap_conn->in_buffer, msg_length);
+       socket_address = socket_get_my_addr(c->socket, conn);
+       if (!socket_address) {
+               ldapsrv_terminate_connection(conn, "ldapsrv_accept: failed to obtain local socket address!");
+               return;
+       }
+       port = socket_address->port;
+       talloc_free(socket_address);
 
-               status = ldapsrv_do_call(call);
-               if (!NT_STATUS_IS_OK(status)) {
-                       ldapsrv_terminate_connection(ldap_conn, "ldapsrv_do_call() failed");
+       if (port == 636) {
+               struct socket_context *tls_socket = tls_init_server(ldapsrv_service->tls_params, c->socket, 
+                                                                   c->event.fde, NULL);
+               if (!tls_socket) {
+                       ldapsrv_terminate_connection(conn, "ldapsrv_accept: tls_init_server() failed");
                        return;
                }
+               talloc_unlink(c, c->socket);
+               talloc_steal(c, tls_socket);
+               c->socket = tls_socket;
+               conn->sockets.tls = tls_socket;
 
-               peek_into_read_buf(&ldap_conn->in_buffer, &buf, &buf_length);
+       } else if (port == 3268) /* Global catalog */ {
+               conn->global_catalog = true;
        }
-
-       status = ldapsrv_do_responses(ldap_conn);
-       if (!NT_STATUS_IS_OK(status)) {
-               ldapsrv_terminate_connection(ldap_conn, "ldapsrv_do_responses() failed");
+       conn->packet = packet_init(conn);
+       if (conn->packet == NULL) {
+               ldapsrv_terminate_connection(conn, "out of memory");
                return;
        }
 
-       if ((ldap_conn->out_buffer.length > 0)||(ldap_conn->sasl_out_buffer.length > 0)) {
-               EVENT_FD_WRITEABLE(conn->event.fde);
-       }
-
-       return;
-}
+       packet_set_private(conn->packet, conn);
+       packet_set_socket(conn->packet, c->socket);
+       packet_set_callback(conn->packet, ldapsrv_decode);
+       packet_set_full_request(conn->packet, ldap_full_packet);
+       packet_set_error_handler(conn->packet, ldapsrv_error_handler);
+       packet_set_event_context(conn->packet, c->event.ctx);
+       packet_set_fde(conn->packet, c->event.fde);
+       packet_set_serialise(conn->packet);
        
-/*
-  called when a LDAP socket becomes writable
-*/
-static void ldapsrv_send(struct stream_connection *conn, uint16_t flags)
-{
-       struct ldapsrv_connection *ldap_conn = talloc_get_type(conn->private, struct ldapsrv_connection);
-
-       DEBUG(10,("ldapsrv_send\n"));
+       /* Ensure we don't get packets until the database is ready below */
+       packet_recv_disable(conn->packet);
 
-       if (!ldapsrv_write_buf(ldap_conn)) {
-               ldapsrv_terminate_connection(ldap_conn, "ldapsrv_write_buf() failed");
+       server_credentials = cli_credentials_init(conn);
+       if (!server_credentials) {
+               stream_terminate_connection(c, "Failed to init server credentials\n");
                return;
        }
+       
+       cli_credentials_set_conf(server_credentials, conn->lp_ctx);
+       status = cli_credentials_set_machine_account(server_credentials, conn->lp_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               stream_terminate_connection(c, talloc_asprintf(conn, "Failed to obtain server credentials, perhaps a standalone server?: %s\n", nt_errstr(status)));
+               return;
+       }
+       conn->server_credentials = server_credentials;
 
-       if (ldap_conn->out_buffer.length == 0 && ldap_conn->sasl_out_buffer.length == 0) {
-               EVENT_FD_NOT_WRITEABLE(conn->event.fde);
+       /* Connections start out anonymous */
+       if (!NT_STATUS_IS_OK(auth_anonymous_session_info(conn, conn->lp_ctx, &conn->session_info))) {
+               ldapsrv_terminate_connection(conn, "failed to setup anonymous session info");
+               return;
        }
 
-       return;
-}
+       if (!NT_STATUS_IS_OK(ldapsrv_backend_Init(conn))) {
+               ldapsrv_terminate_connection(conn, "backend Init failed");
+               return;
+       }
 
-/*
-  initialise a server_context from a open socket and register a event handler
-  for reading from that socket
-*/
-static void ldapsrv_accept(struct stream_connection *conn)
-{
-       struct ldapsrv_connection *ldap_conn;
+       /* load limits from the conf partition */
+       ldapsrv_load_limits(conn); /* should we fail on error ? */
 
-       DEBUG(10, ("ldapsrv_accept\n"));
+       /* register the server */       
+       irpc_add_name(c->msg_ctx, "ldap_server");
 
-       ldap_conn = talloc_zero(conn, struct ldapsrv_connection);
+       /* set connections limits */
+       conn->limits.ite = event_add_timed(c->event.ctx, conn, 
+                                          timeval_current_ofs(conn->limits.initial_timeout, 0),
+                                          ldapsrv_conn_init_timeout, conn);
 
-       if (ldap_conn == NULL)
-               return;
+       packet_recv_enable(conn->packet);
 
-       ldap_conn->connection = conn;
-       ldap_conn->service = talloc_get_type(conn->private, struct ldapsrv_service);
-       conn->private = ldap_conn;
 }
 
 static const struct stream_server_ops ldap_stream_ops = {
@@ -471,78 +440,152 @@ static const struct stream_server_ops ldap_stream_ops = {
 /*
   add a socket address to the list of events, one event per port
 */
-static NTSTATUS add_socket(struct event_context *event_context, const struct model_ops *model_ops,
+static NTSTATUS add_socket(struct event_context *event_context,
+                          struct loadparm_context *lp_ctx, 
+                          const struct model_ops *model_ops,
                           const char *address, struct ldapsrv_service *ldap_service)
 {
        uint16_t port = 389;
        NTSTATUS status;
+       struct ldb_context *ldb;
 
-       status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, 
-                                    "ipv4", address, &port, ldap_service);
-       NT_STATUS_NOT_OK_RETURN(status);
+       status = stream_setup_socket(event_context, lp_ctx,
+                                    model_ops, &ldap_stream_ops, 
+                                    "ipv4", address, &port, 
+                                    lp_socket_options(lp_ctx), 
+                                    ldap_service);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
+                        address, port, nt_errstr(status)));
+       }
+
+       if (tls_support(ldap_service->tls_params)) {
+               /* add ldaps server */
+               port = 636;
+               status = stream_setup_socket(event_context, lp_ctx, 
+                                            model_ops, &ldap_stream_ops, 
+                                            "ipv4", address, &port, 
+                                            lp_socket_options(lp_ctx), 
+                                            ldap_service);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
+                                address, port, nt_errstr(status)));
+               }
+       }
 
-       port = 3268;
+       /* Load LDAP database */
+       ldb = samdb_connect(ldap_service, lp_ctx, system_session(ldap_service, lp_ctx));
+       if (!ldb) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       
+       if (samdb_is_gc(ldb)) {
+               port = 3268;
+               status = stream_setup_socket(event_context, lp_ctx,
+                                            model_ops, &ldap_stream_ops, 
+                                            "ipv4", address, &port, 
+                                            lp_socket_options(lp_ctx), 
+                                            ldap_service);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
+                                address, port, nt_errstr(status)));
+               }
+       }
 
-       return stream_setup_socket(event_context, model_ops, &ldap_stream_ops, 
-                                  "ipv4", address, &port, ldap_service);
+       return status;
 }
 
 /*
   open the ldap server sockets
 */
-static NTSTATUS ldapsrv_init(struct event_context *event_context, const struct model_ops *model_ops)
+static void ldapsrv_task_init(struct task_server *task)
 {      
+       char *ldapi_path;
        struct ldapsrv_service *ldap_service;
-       struct ldapsrv_partition *rootDSE_part;
-       struct ldapsrv_partition *part;
        NTSTATUS status;
+       const struct model_ops *model_ops;
 
-       DEBUG(10,("ldapsrv_init\n"));
+       switch (lp_server_role(task->lp_ctx)) {
+       case ROLE_STANDALONE:
+               task_server_terminate(task, "ldap_server: no LDAP server required in standalone configuration");
+               return;
+       case ROLE_DOMAIN_MEMBER:
+               task_server_terminate(task, "ldap_server: no LDAP server required in member server configuration");
+               return;
+       case ROLE_DOMAIN_CONTROLLER:
+               /* Yes, we want an LDAP server */
+               break;
+       }
 
-       ldap_service = talloc_zero(event_context, struct ldapsrv_service);
-       NT_STATUS_HAVE_NO_MEMORY(ldap_service);
+       task_server_set_title(task, "task[ldapsrv]");
 
-       rootDSE_part = talloc(ldap_service, struct ldapsrv_partition);
-       NT_STATUS_HAVE_NO_MEMORY(rootDSE_part);
+       /* run the ldap server as a single process */
+       model_ops = process_model_byname("single");
+       if (!model_ops) goto failed;
 
-       rootDSE_part->base_dn = ""; /* RootDSE */
-       rootDSE_part->ops = ldapsrv_get_rootdse_partition_ops();
+       ldap_service = talloc_zero(task, struct ldapsrv_service);
+       if (ldap_service == NULL) goto failed;
 
-       ldap_service->rootDSE = rootDSE_part;
-       DLIST_ADD_END(ldap_service->partitions, rootDSE_part, struct ldapsrv_partition *);
+       ldap_service->task = task;
 
-       part = talloc(ldap_service, struct ldapsrv_partition);
-       NT_STATUS_HAVE_NO_MEMORY(part);
+       ldap_service->tls_params = tls_initialise(ldap_service, task->lp_ctx);
+       if (ldap_service->tls_params == NULL) goto failed;
 
-       part->base_dn = "*"; /* default partition */
-       if (lp_parm_bool(-1, "ldapsrv", "hacked", False)) {
-               part->ops = ldapsrv_get_hldb_partition_ops();
-       } else {
-               part->ops = ldapsrv_get_sldb_partition_ops();
-       }
-
-       ldap_service->default_partition = part;
-       DLIST_ADD_END(ldap_service->partitions, part, struct ldapsrv_partition *);
-
-       if (lp_interfaces() && lp_bind_interfaces_only()) {
-               int num_interfaces = iface_count();
+       if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) {
+               struct interface *ifaces;
+               int num_interfaces;
                int i;
 
+               load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces);
+               num_interfaces = iface_count(ifaces);
+
                /* We have been given an interfaces line, and been 
                   told to only bind to those interfaces. Create a
                   socket per interface and bind to only these.
                */
                for(i = 0; i < num_interfaces; i++) {
-                       const char *address = sys_inet_ntoa(*iface_n_ip(i));
-                       status = add_socket(event_context, model_ops, address, ldap_service);
-                       NT_STATUS_NOT_OK_RETURN(status);
+                       const char *address = iface_n_ip(ifaces, i);
+                       status = add_socket(task->event_ctx, task->lp_ctx, model_ops, address, ldap_service);
+                       if (!NT_STATUS_IS_OK(status)) goto failed;
                }
        } else {
-               status = add_socket(event_context, model_ops, lp_socket_address(), ldap_service);
-               NT_STATUS_NOT_OK_RETURN(status);
+               status = add_socket(task->event_ctx, task->lp_ctx, model_ops, 
+                                   lp_socket_address(task->lp_ctx), ldap_service);
+               if (!NT_STATUS_IS_OK(status)) goto failed;
        }
 
-       return NT_STATUS_OK;
+       ldapi_path = private_path(ldap_service, task->lp_ctx, "ldapi");
+       if (!ldapi_path) {
+               goto failed;
+       }
+
+       status = stream_setup_socket(task->event_ctx, task->lp_ctx,
+                                    model_ops, &ldap_stream_ops, 
+                                    "unix", ldapi_path, NULL, 
+                                    lp_socket_options(task->lp_ctx), 
+                                    ldap_service);
+       talloc_free(ldapi_path);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("ldapsrv failed to bind to %s - %s\n",
+                        ldapi_path, nt_errstr(status)));
+       }
+
+       return;
+
+failed:
+       task_server_terminate(task, "Failed to startup ldap server task");      
+}
+
+/*
+  called on startup of the web server service It's job is to start
+  listening on all configured sockets
+*/
+static NTSTATUS ldapsrv_init(struct event_context *event_context, 
+                            struct loadparm_context *lp_ctx,
+                            const struct model_ops *model_ops)
+{      
+       return task_server_startup(event_context, lp_ctx, "ldap", model_ops, 
+                                  ldapsrv_task_init);
 }