Revert "smbd: add smbd_server_connection->raw_ev_ctx pointer"
[garming/samba-autobuild/.git] / source3 / smbd / process.c
index a3a0ac417008043b03a75f261dac486a0e246c65..99693ed1315b98360ca164439b33d061d703b9a2 100644 (file)
@@ -32,6 +32,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "lib/messages_ctdb.h"
 #include "smbprofile.h"
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "libsmb/libsmb.h"
 #include "../libcli/security/dom_sid.h"
 #include "../libcli/security/security_token.h"
 #include "lib/id_cache.h"
-#include "serverid.h"
+#include "lib/util/sys_rw_data.h"
 #include "system/threads.h"
+#include "lib/pthreadpool/pthreadpool_tevent.h"
+#include "util_event.h"
 
 /* Internal message queue for deferred opens. */
 struct pending_message_list {
@@ -57,7 +60,7 @@ struct pending_message_list {
        struct deferred_open_record *open_rec;
 };
 
-static void construct_reply_common(struct smb_request *req, const char *inbuf,
+static void construct_reply_common(uint8_t cmd, const uint8_t *inbuf,
                                   char *outbuf);
 static struct pending_message_list *get_deferred_open_message_smb(
        struct smbd_server_connection *sconn, uint64_t mid);
@@ -161,15 +164,9 @@ static bool smbd_unlock_socket_internal(struct smbXsrv_connection *xconn)
 
 #ifdef HAVE_ROBUST_MUTEXES
        if (xconn->smb1.echo_handler.socket_mutex != NULL) {
-               int ret = EINTR;
-
-               while (ret == EINTR) {
-                       ret = pthread_mutex_unlock(
-                               xconn->smb1.echo_handler.socket_mutex);
-                       if (ret == 0) {
-                               break;
-                       }
-               }
+               int ret;
+               ret = pthread_mutex_unlock(
+                       xconn->smb1.echo_handler.socket_mutex);
                if (ret != 0) {
                        DEBUG(1, ("pthread_mutex_unlock failed: %s\n",
                                  strerror(ret)));
@@ -211,12 +208,11 @@ void smbd_unlock_socket(struct smbXsrv_connection *xconn)
  Send an smb to a fd.
 ****************************************************************************/
 
-bool srv_send_smb(struct smbd_server_connection *sconn, char *buffer,
+bool srv_send_smb(struct smbXsrv_connection *xconn, char *buffer,
                  bool do_signing, uint32_t seqnum,
                  bool do_encrypt,
                  struct smb_perfcount_data *pcd)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
        size_t len = 0;
        ssize_t ret;
        char *buf_out = buffer;
@@ -278,10 +274,10 @@ out:
  Setup the word count and byte count for a smb message.
 ********************************************************************/
 
-int srv_set_message(char *buf,
-                        int num_words,
-                        int num_bytes,
-                        bool zero)
+size_t srv_set_message(char *buf,
+                      size_t num_words,
+                      size_t num_bytes,
+                      bool zero)
 {
        if (zero && (num_words || num_bytes)) {
                memset(buf + smb_size,'\0',num_words*2 + num_bytes);
@@ -584,7 +580,7 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx,
 static bool init_smb_request(struct smb_request *req,
                             struct smbd_server_connection *sconn,
                             struct smbXsrv_connection *xconn,
-                            const uint8 *inbuf,
+                            const uint8_t *inbuf,
                             size_t unread_bytes, bool encrypted,
                             uint32_t seqnum)
 {
@@ -618,16 +614,18 @@ static bool init_smb_request(struct smb_request *req,
        req->encrypted = encrypted;
        req->sconn = sconn;
        req->xconn = xconn;
-       status = smb1srv_tcon_lookup(xconn, req->tid, now, &tcon);
-       if (NT_STATUS_IS_OK(status)) {
-               req->conn = tcon->compat;
-       } else {
-               req->conn = NULL;
+       req->conn = NULL;
+       if (xconn != NULL) {
+               status = smb1srv_tcon_lookup(xconn, req->tid, now, &tcon);
+               if (NT_STATUS_IS_OK(status)) {
+                       req->conn = tcon->compat;
+               }
        }
        req->chain_fsp = NULL;
        req->smb2req = NULL;
        req->priv_paths = NULL;
        req->chain = NULL;
+       req->posix_pathnames = lp_posix_pathnames();
        smb_init_perfcount_data(&req->pcd);
 
        /* Ensure we have at least wct words and 2 bytes of bcc. */
@@ -692,7 +690,7 @@ static void smbd_deferred_open_timer(struct tevent_context *ev,
        /* If it's still there and was processed, remove it. */
        msg = get_deferred_open_message_smb(sconn, mid);
        if (msg && msg->processed) {
-               remove_deferred_open_message_smb(sconn, mid);
+               remove_deferred_open_message_smb(xconn, mid);
        }
 }
 
@@ -748,8 +746,7 @@ static bool push_queued_message(struct smb_request *req,
        }
 #endif
 
-       DLIST_ADD_END(req->sconn->deferred_open_queue, msg,
-                     struct pending_message_list *);
+       DLIST_ADD_END(req->sconn->deferred_open_queue, msg);
 
        DEBUG(10,("push_message: pushed message length %u on "
                  "deferred_open_queue\n", (unsigned int)msg_len));
@@ -761,13 +758,14 @@ static bool push_queued_message(struct smb_request *req,
  Function to delete a sharing violation open message by mid.
 ****************************************************************************/
 
-void remove_deferred_open_message_smb(struct smbd_server_connection *sconn,
+void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
                                      uint64_t mid)
 {
+       struct smbd_server_connection *sconn = xconn->client->sconn;
        struct pending_message_list *pml;
 
        if (sconn->using_smb2) {
-               remove_deferred_open_message_smb2(sconn, mid);
+               remove_deferred_open_message_smb2(xconn, mid);
                return;
        }
 
@@ -789,14 +787,15 @@ void remove_deferred_open_message_smb(struct smbd_server_connection *sconn,
  schedule it for immediate processing.
 ****************************************************************************/
 
-bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn,
+bool schedule_deferred_open_message_smb(struct smbXsrv_connection *xconn,
                                        uint64_t mid)
 {
+       struct smbd_server_connection *sconn = xconn->client->sconn;
        struct pending_message_list *pml;
        int i = 0;
 
        if (sconn->using_smb2) {
-               return schedule_deferred_open_message_smb2(sconn, mid);
+               return schedule_deferred_open_message_smb2(xconn, mid);
        }
 
        for (pml = sconn->deferred_open_queue; pml; pml = pml->next) {
@@ -823,7 +822,14 @@ bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn,
                                "scheduling mid %llu\n",
                                (unsigned long long)mid ));
 
-                       te = tevent_add_timer(pml->sconn->ev_ctx,
+                       /*
+                        * smbd_deferred_open_timer() calls
+                        * process_smb() to redispatch the request
+                        * including the required impersonation.
+                        *
+                        * So we can just use the raw tevent_context.
+                        */
+                       te = tevent_add_timer(xconn->client->raw_ev_ctx,
                                              pml,
                                              timeval_zero(),
                                              smbd_deferred_open_timer,
@@ -853,12 +859,13 @@ bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn,
  Return true if this mid is on the deferred queue and was not yet processed.
 ****************************************************************************/
 
-bool open_was_deferred(struct smbd_server_connection *sconn, uint64_t mid)
+bool open_was_deferred(struct smbXsrv_connection *xconn, uint64_t mid)
 {
+       struct smbd_server_connection *sconn = xconn->client->sconn;
        struct pending_message_list *pml;
 
        if (sconn->using_smb2) {
-               return open_was_deferred_smb2(sconn, mid);
+               return open_was_deferred_smb2(xconn, mid);
        }
 
        for (pml = sconn->deferred_open_queue; pml; pml = pml->next) {
@@ -966,7 +973,7 @@ static void smbd_sig_term_handler(struct tevent_context *ev,
        exit_server_cleanly("termination signal");
 }
 
-void smbd_setup_sig_term_handler(struct smbd_server_connection *sconn)
+static void smbd_setup_sig_term_handler(struct smbd_server_connection *sconn)
 {
        struct tevent_signal *se;
 
@@ -996,7 +1003,7 @@ static void smbd_sig_hup_handler(struct tevent_context *ev,
        reload_services(sconn, conn_snum_used, false);
 }
 
-void smbd_setup_sig_hup_handler(struct smbd_server_connection *sconn)
+static void smbd_setup_sig_hup_handler(struct smbd_server_connection *sconn)
 {
        struct tevent_signal *se;
 
@@ -1338,8 +1345,8 @@ static const struct smb_message_struct {
 ********************************************************************/
 
 static bool create_outbuf(TALLOC_CTX *mem_ctx, struct smb_request *req,
-                         const char *inbuf, char **outbuf, uint8_t num_words,
-                         uint32_t num_bytes)
+                         const uint8_t *inbuf, char **outbuf,
+                         uint8_t num_words, uint32_t num_bytes)
 {
        size_t smb_len = MIN_SMB_SIZE + VWV(num_words) + num_bytes;
 
@@ -1365,7 +1372,7 @@ static bool create_outbuf(TALLOC_CTX *mem_ctx, struct smb_request *req,
                return false;
        }
 
-       construct_reply_common(req, inbuf, *outbuf);
+       construct_reply_common(req->cmd, inbuf, *outbuf);
        srv_set_message(*outbuf, num_words, num_bytes, false);
        /*
         * Zero out the word area, the caller has to take care of the bcc area
@@ -1378,10 +1385,10 @@ static bool create_outbuf(TALLOC_CTX *mem_ctx, struct smb_request *req,
        return true;
 }
 
-void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes)
+void reply_outbuf(struct smb_request *req, uint8_t num_words, uint32_t num_bytes)
 {
        char *outbuf;
-       if (!create_outbuf(req, req, (const char *)req->inbuf, &outbuf, num_words,
+       if (!create_outbuf(req, req, req->inbuf, &outbuf, num_words,
                           num_bytes)) {
                smb_panic("could not allocate output buffer\n");
        }
@@ -1426,6 +1433,54 @@ static void smb_dump(const char *name, int type, const char *data)
        TALLOC_FREE(fname);
 }
 
+static void smb1srv_update_crypto_flags(struct smbXsrv_session *session,
+                                       struct smb_request *req,
+                                       uint8_t type,
+                                       bool *update_session_globalp,
+                                       bool *update_tcon_globalp)
+{
+       connection_struct *conn = req->conn;
+       struct smbXsrv_tcon *tcon = conn ? conn->tcon : NULL;
+       uint8_t encrypt_flag = SMBXSRV_PROCESSED_UNENCRYPTED_PACKET;
+       uint8_t sign_flag = SMBXSRV_PROCESSED_UNSIGNED_PACKET;
+       bool update_session = false;
+       bool update_tcon = false;
+
+       if (req->encrypted) {
+               encrypt_flag = SMBXSRV_PROCESSED_ENCRYPTED_PACKET;
+       }
+
+       if (srv_is_signing_active(req->xconn)) {
+               sign_flag = SMBXSRV_PROCESSED_SIGNED_PACKET;
+       } else if ((type == SMBecho) || (type == SMBsesssetupX)) {
+               /*
+                * echo can be unsigned. Sesssion setup except final
+                * session setup response too
+                */
+               sign_flag &= ~SMBXSRV_PROCESSED_UNSIGNED_PACKET;
+       }
+
+       update_session |= smbXsrv_set_crypto_flag(
+               &session->global->encryption_flags, encrypt_flag);
+       update_session |= smbXsrv_set_crypto_flag(
+               &session->global->signing_flags, sign_flag);
+
+       if (tcon) {
+               update_tcon |= smbXsrv_set_crypto_flag(
+                       &tcon->global->encryption_flags, encrypt_flag);
+               update_tcon |= smbXsrv_set_crypto_flag(
+                       &tcon->global->signing_flags, sign_flag);
+       }
+
+       if (update_session) {
+               session->global->channels[0].encryption_cipher = SMB_ENCRYPTION_GSSAPI;
+       }
+
+       *update_session_globalp = update_session;
+       *update_tcon_globalp = update_tcon;
+       return;
+}
+
 /****************************************************************************
  Prepare everything for calling the actual request function, and potentially
  call the request function via the "new" interface.
@@ -1439,7 +1494,7 @@ static void smb_dump(const char *name, int type, const char *data)
  find.
 ****************************************************************************/
 
-static connection_struct *switch_message(uint8 type, struct smb_request *req)
+static connection_struct *switch_message(uint8_t type, struct smb_request *req)
 {
        int flags;
        uint64_t session_tag;
@@ -1523,13 +1578,16 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req)
                }
        }
 
-       if (session_tag != xconn->last_session_id) {
-               struct user_struct *vuser = NULL;
+       if (session != NULL && !(flags & AS_USER)) {
+               struct user_struct *vuser = session->compat;
 
-               xconn->last_session_id = session_tag;
-               if (session) {
-                       vuser = session->compat;
-               }
+               /*
+                * change_to_user() implies set_current_user_info()
+                * and chdir_connect_service().
+                *
+                * So we only call set_current_user_info if
+                * we don't have AS_USER specified.
+                */
                if (vuser) {
                        set_current_user_info(
                                vuser->session_info->unix_info->sanitized_username,
@@ -1555,6 +1613,12 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req)
                        return NULL;
                }
 
+               set_current_case_sensitive(conn, SVAL(req->inbuf,smb_flg));
+
+               /*
+                * change_to_user() implies set_current_user_info()
+                * and chdir_connect_service().
+                */
                if (!change_to_user(conn,session_tag)) {
                        DEBUG(0, ("Error: Could not change to user. Removing "
                                "deferred open, mid=%llu.\n",
@@ -1576,6 +1640,15 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req)
                        reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                        return conn;
                }
+       } else if (flags & AS_GUEST) {
+               /*
+                * Does this protocol need to be run as guest? (Only archane
+                * messenger service requests have this...)
+                */
+               if (!change_to_guest()) {
+                       reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+                       return conn;
+               }
        } else {
                /* This call needs to be run as root */
                change_to_root_user();
@@ -1599,46 +1672,44 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req)
                        }
                }
 
-               if (!set_current_service(conn,SVAL(req->inbuf,smb_flg),
-                                        (flags & (AS_USER|DO_CHDIR)
-                                         ?True:False))) {
-                       reply_nterror(req, NT_STATUS_ACCESS_DENIED);
-                       return conn;
+               if (flags & DO_CHDIR) {
+                       bool ok;
+
+                       ok = chdir_current_service(conn);
+                       if (!ok) {
+                               reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+                               return conn;
+                       }
                }
                conn->num_smb_operations++;
        }
 
        /*
-        * Does this protocol need to be run as guest? (Only archane
-        * messenger service requests have this...)
+        * Update encryption and signing state tracking flags that are
+        * used by smbstatus to display signing and encryption status.
         */
-       if (flags & AS_GUEST) {
-               char *raddr;
-               bool ok;
-
-               if (!change_to_guest()) {
-                       reply_nterror(req, NT_STATUS_ACCESS_DENIED);
-                       return conn;
-               }
-
-               raddr = tsocket_address_inet_addr_string(xconn->remote_address,
-                                                        talloc_tos());
-               if (raddr == NULL) {
-                       reply_nterror(req, NT_STATUS_NO_MEMORY);
-                       return conn;
+       if (session != NULL) {
+               bool update_session_global = false;
+               bool update_tcon_global = false;
+
+               smb1srv_update_crypto_flags(session, req, type,
+                                           &update_session_global,
+                                           &update_tcon_global);
+
+               if (update_session_global) {
+                       status = smbXsrv_session_update(session);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               reply_nterror(req, NT_STATUS_UNSUCCESSFUL);
+                               return conn;
+                       }
                }
 
-               /*
-                * Haven't we checked this in smbd_process already???
-                */
-
-               ok = allow_access(lp_hosts_deny(-1), lp_hosts_allow(-1),
-                                 xconn->remote_hostname, raddr);
-               TALLOC_FREE(raddr);
-
-               if (!ok) {
-                       reply_nterror(req, NT_STATUS_ACCESS_DENIED);
-                       return conn;
+               if (update_tcon_global) {
+                       status = smbXsrv_tcon_update(req->conn->tcon);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               reply_nterror(req, NT_STATUS_UNSUCCESSFUL);
+                               return conn;
+                       }
                }
        }
 
@@ -1650,19 +1721,19 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req)
  Construct a reply to the incoming packet.
 ****************************************************************************/
 
-static void construct_reply(struct smbd_server_connection *sconn,
+static void construct_reply(struct smbXsrv_connection *xconn,
                            char *inbuf, int size, size_t unread_bytes,
                            uint32_t seqnum, bool encrypted,
                            struct smb_perfcount_data *deferred_pcd)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbd_server_connection *sconn = xconn->client->sconn;
        struct smb_request *req;
 
        if (!(req = talloc(talloc_tos(), struct smb_request))) {
                smb_panic("could not allocate smb_request");
        }
 
-       if (!init_smb_request(req, sconn, xconn, (uint8 *)inbuf, unread_bytes,
+       if (!init_smb_request(req, sconn, xconn, (uint8_t *)inbuf, unread_bytes,
                              encrypted, seqnum)) {
                exit_server_cleanly("Invalid SMB request");
        }
@@ -1693,7 +1764,7 @@ static void construct_reply(struct smbd_server_connection *sconn,
        smb_request_done(req);
 }
 
-static void construct_reply_chain(struct smbd_server_connection *sconn,
+static void construct_reply_chain(struct smbXsrv_connection *xconn,
                                  char *inbuf, int size, uint32_t seqnum,
                                  bool encrypted,
                                  struct smb_perfcount_data *deferred_pcd)
@@ -1703,13 +1774,13 @@ static void construct_reply_chain(struct smbd_server_connection *sconn,
        unsigned num_reqs;
        bool ok;
 
-       ok = smb1_parse_chain(talloc_tos(), (uint8_t *)inbuf, sconn, encrypted,
+       ok = smb1_parse_chain(xconn, (uint8_t *)inbuf, xconn, encrypted,
                              seqnum, &reqs, &num_reqs);
        if (!ok) {
                char errbuf[smb_size];
                error_packet(errbuf, 0, 0, NT_STATUS_INVALID_PARAMETER,
                             __LINE__, __FILE__);
-               if (!srv_send_smb(sconn, errbuf, true, seqnum, encrypted,
+               if (!srv_send_smb(xconn, errbuf, true, seqnum, encrypted,
                                  NULL)) {
                        exit_server_cleanly("construct_reply_chain: "
                                            "srv_send_smb failed.");
@@ -1773,12 +1844,13 @@ void smb_request_done(struct smb_request *req)
 
                next->vuid = SVAL(req->outbuf, smb_uid);
                next->tid  = SVAL(req->outbuf, smb_tid);
-               status = smb1srv_tcon_lookup(req->xconn, req->tid,
+               status = smb1srv_tcon_lookup(req->xconn, next->tid,
                                             now, &tcon);
+
                if (NT_STATUS_IS_OK(status)) {
-                       req->conn = tcon->compat;
+                       next->conn = tcon->compat;
                } else {
-                       req->conn = NULL;
+                       next->conn = NULL;
                }
                next->chain_fsp = req->chain_fsp;
                next->inbuf = req->inbuf;
@@ -1830,7 +1902,7 @@ void smb_request_done(struct smb_request *req)
                first_req->outbuf, talloc_get_size(first_req->outbuf) - 4);
 
 shipit:
-       if (!srv_send_smb(first_req->sconn,
+       if (!srv_send_smb(first_req->xconn,
                          (char *)first_req->outbuf,
                          true, first_req->seqnum+1,
                          IS_CONN_ENCRYPTED(req->conn)||first_req->encrypted,
@@ -1846,7 +1918,7 @@ error:
        {
                char errbuf[smb_size];
                error_packet(errbuf, 0, 0, status, __LINE__, __FILE__);
-               if (!srv_send_smb(req->sconn, errbuf, true,
+               if (!srv_send_smb(req->xconn, errbuf, true,
                                  req->seqnum+1, req->encrypted,
                                  NULL)) {
                        exit_server_cleanly("construct_reply_chain: "
@@ -1865,10 +1937,10 @@ static void process_smb(struct smbXsrv_connection *xconn,
                        uint32_t seqnum, bool encrypted,
                        struct smb_perfcount_data *deferred_pcd)
 {
-       struct smbd_server_connection *sconn = xconn->sconn;
+       struct smbd_server_connection *sconn = xconn->client->sconn;
        int msg_type = CVAL(inbuf,0);
 
-       DO_PROFILE_INC(smb_count);
+       DO_PROFILE_INC(request);
 
        DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type,
                    smb_len(inbuf) ) );
@@ -1889,9 +1961,10 @@ static void process_smb(struct smbXsrv_connection *xconn,
                if (smbd_is_smb2_header(inbuf, nread)) {
                        const uint8_t *inpdu = inbuf + NBT_HDR_SIZE;
                        size_t pdulen = nread - NBT_HDR_SIZE;
-                       smbd_smb2_first_negprot(xconn, inpdu, pdulen);
+                       smbd_smb2_process_negprot(xconn, 0, inpdu, pdulen);
                        return;
-               } else if (nread >= smb_size && valid_smb_header(inbuf)
+               }
+               if (nread >= smb_size && valid_smb_header(inbuf)
                                && CVAL(inbuf, smb_com) != 0x72) {
                        /* This is a non-negprot SMB1 packet.
                           Disable SMB2 from now on. */
@@ -1921,10 +1994,10 @@ static void process_smb(struct smbXsrv_connection *xconn,
        show_msg((char *)inbuf);
 
        if ((unread_bytes == 0) && smb1_is_chain(inbuf)) {
-               construct_reply_chain(sconn, (char *)inbuf, nread,
+               construct_reply_chain(xconn, (char *)inbuf, nread,
                                      seqnum, encrypted, deferred_pcd);
        } else {
-               construct_reply(sconn, (char *)inbuf, nread, unread_bytes,
+               construct_reply(xconn, (char *)inbuf, nread, unread_bytes,
                                seqnum, encrypted, deferred_pcd);
        }
 
@@ -1965,17 +2038,17 @@ const char *smb_fn_name(int type)
  Helper functions for contruct_reply.
 ****************************************************************************/
 
-void add_to_common_flags2(uint32 v)
+void add_to_common_flags2(uint32_t v)
 {
        common_flags2 |= v;
 }
 
-void remove_from_common_flags2(uint32 v)
+void remove_from_common_flags2(uint32_t v)
 {
        common_flags2 &= ~v;
 }
 
-static void construct_reply_common(struct smb_request *req, const char *inbuf,
+static void construct_reply_common(uint8_t cmd, const uint8_t *inbuf,
                                   char *outbuf)
 {
        uint16_t in_flags2 = SVAL(inbuf,smb_flg2);
@@ -1987,7 +2060,7 @@ static void construct_reply_common(struct smb_request *req, const char *inbuf,
 
        srv_set_message(outbuf,0,0,false);
 
-       SCVAL(outbuf, smb_com, req->cmd);
+       SCVAL(outbuf, smb_com, cmd);
        SIVAL(outbuf,smb_rcls,0);
        SCVAL(outbuf,smb_flg, FLAG_REPLY | (CVAL(inbuf,smb_flg) & FLAG_CASELESS_PATHNAMES)); 
        SSVAL(outbuf,smb_flg2, out_flags2);
@@ -1996,13 +2069,14 @@ static void construct_reply_common(struct smb_request *req, const char *inbuf,
 
        SSVAL(outbuf,smb_tid,SVAL(inbuf,smb_tid));
        SSVAL(outbuf,smb_pid,SVAL(inbuf,smb_pid));
+       SSVAL(outbuf,smb_pidhigh,SVAL(inbuf,smb_pidhigh));
        SSVAL(outbuf,smb_uid,SVAL(inbuf,smb_uid));
        SSVAL(outbuf,smb_mid,SVAL(inbuf,smb_mid));
 }
 
 void construct_reply_common_req(struct smb_request *req, char *outbuf)
 {
-       construct_reply_common(req, (const char *)req->inbuf, outbuf);
+       construct_reply_common(req->cmd, req->inbuf, outbuf);
 }
 
 /**
@@ -2396,14 +2470,18 @@ static bool smb1_parse_chain_cb(uint8_t cmd,
 }
 
 bool smb1_parse_chain(TALLOC_CTX *mem_ctx, const uint8_t *buf,
-                     struct smbd_server_connection *sconn,
+                     struct smbXsrv_connection *xconn,
                      bool encrypted, uint32_t seqnum,
                      struct smb_request ***reqs, unsigned *num_reqs)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbd_server_connection *sconn = NULL;
        struct smb1_parse_chain_state state;
        unsigned i;
 
+       if (xconn != NULL) {
+               sconn = xconn->client->sconn;
+       }
+
        state.mem_ctx = mem_ctx;
        state.buf = buf;
        state.sconn = sconn;
@@ -2608,18 +2686,32 @@ static void smbd_release_ip_immediate(struct tevent_context *ctx,
 /****************************************************************************
 received when we should release a specific IP
 ****************************************************************************/
-static bool release_ip(const char *ip, void *priv)
+static int release_ip(struct tevent_context *ev,
+                     uint32_t src_vnn, uint32_t dst_vnn,
+                     uint64_t dst_srvid,
+                     const uint8_t *msg, size_t msglen,
+                     void *private_data)
 {
        struct smbd_release_ip_state *state =
-               talloc_get_type_abort(priv,
+               talloc_get_type_abort(private_data,
                struct smbd_release_ip_state);
        struct smbXsrv_connection *xconn = state->xconn;
+       const char *ip;
        const char *addr = state->addr;
        const char *p = addr;
 
+       if (msglen == 0) {
+               return 0;
+       }
+       if (msg[msglen-1] != '\0') {
+               return 0;
+       }
+
+       ip = (const char *)msg;
+
        if (!NT_STATUS_IS_OK(xconn->transport.status)) {
                /* avoid recursion */
-               return false;
+               return 0;
        }
 
        if (strncmp("::ffff:", addr, 7) == 0) {
@@ -2653,17 +2745,19 @@ static bool release_ip(const char *ip, void *priv)
                 * as we might be called from within ctdbd_migrate(),
                 * we need to defer our action to the next event loop
                 */
-               tevent_schedule_immediate(state->im, xconn->ev_ctx,
-                                         smbd_release_ip_immediate, state);
+               tevent_schedule_immediate(state->im,
+                                         xconn->client->raw_ev_ctx,
+                                         smbd_release_ip_immediate,
+                                         state);
 
                /*
                 * Make sure we don't get any io on the connection.
                 */
                xconn->transport.status = NT_STATUS_ADDRESS_CLOSED;
-               return true;
+               return EADDRNOTAVAIL;
        }
 
-       return false;
+       return 0;
 }
 
 static NTSTATUS smbd_register_ips(struct smbXsrv_connection *xconn,
@@ -2672,8 +2766,9 @@ static NTSTATUS smbd_register_ips(struct smbXsrv_connection *xconn,
 {
        struct smbd_release_ip_state *state;
        struct ctdbd_connection *cconn;
+       int ret;
 
-       cconn = messaging_ctdbd_connection();
+       cconn = messaging_ctdb_connection();
        if (cconn == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -2691,7 +2786,11 @@ static NTSTATUS smbd_register_ips(struct smbXsrv_connection *xconn,
                return NT_STATUS_NO_MEMORY;
        }
 
-       return ctdbd_register_ips(cconn, srv, clnt, release_ip, state);
+       ret = ctdbd_register_ips(cconn, srv, clnt, release_ip, state);
+       if (ret != 0) {
+               return map_nt_error_from_unix(ret);
+       }
+       return NT_STATUS_OK;
 }
 
 static void msg_kill_client_ip(struct messaging_context *msg_ctx,
@@ -2703,7 +2802,7 @@ static void msg_kill_client_ip(struct messaging_context *msg_ctx,
        const char *ip = (char *) data->data;
        char *client_ip;
 
-       DEBUG(10, ("Got kill request for client IP %s\n", ip));
+       DBG_DEBUG("Got kill request for client IP %s\n", ip);
 
        client_ip = tsocket_address_inet_addr_string(sconn->remote_address,
                                                     talloc_tos());
@@ -2712,8 +2811,8 @@ static void msg_kill_client_ip(struct messaging_context *msg_ctx,
        }
 
        if (strequal(ip, client_ip)) {
-               DEBUG(1, ("Got kill client message for %s - "
-                         "exiting immediately\n", ip));
+               DBG_WARNING("Got kill client message for %s - "
+                           "exiting immediately\n", ip);
                exit_server_cleanly("Forced disconnect for client");
        }
 
@@ -2727,7 +2826,7 @@ static bool keepalive_fn(const struct timeval *now, void *private_data)
 {
        struct smbd_server_connection *sconn = talloc_get_type_abort(
                private_data, struct smbd_server_connection);
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbXsrv_connection *xconn = NULL;
        bool ret;
 
        if (sconn->using_smb2) {
@@ -2735,6 +2834,10 @@ static bool keepalive_fn(const struct timeval *now, void *private_data)
                return false;
        }
 
+       /*
+        * With SMB1 we only have 1 connection
+        */
+       xconn = sconn->client->connections;
        smbd_lock_socket(xconn);
        ret = send_keepalive(xconn->transport.sock);
        smbd_unlock_socket(xconn);
@@ -2809,7 +2912,7 @@ static bool housekeeping_fn(const struct timeval *now, void *private_data)
 
 struct smbd_echo_read_state {
        struct tevent_context *ev;
-       struct smbd_server_connection *sconn;
+       struct smbXsrv_connection *xconn;
 
        char *buf;
        size_t buflen;
@@ -2821,11 +2924,10 @@ static void smbd_echo_read_waited(struct tevent_req *subreq);
 
 static struct tevent_req *smbd_echo_read_send(
        TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-       struct smbd_server_connection *sconn)
+       struct smbXsrv_connection *xconn)
 {
        struct tevent_req *req, *subreq;
        struct smbd_echo_read_state *state;
-       struct smbXsrv_connection *xconn = sconn->conn;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct smbd_echo_read_state);
@@ -2833,9 +2935,9 @@ static struct tevent_req *smbd_echo_read_send(
                return NULL;
        }
        state->ev = ev;
-       state->sconn = sconn;
+       state->xconn = xconn;
 
-       subreq = wait_for_read_send(state, ev, xconn->transport.sock);
+       subreq = wait_for_read_send(state, ev, xconn->transport.sock, false);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
@@ -2877,8 +2979,7 @@ static void smbd_echo_read_waited(struct tevent_req *subreq)
                subreq, struct tevent_req);
        struct smbd_echo_read_state *state = tevent_req_data(
                req, struct smbd_echo_read_state);
-       struct smbd_server_connection *sconn = state->sconn;
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbXsrv_connection *xconn = state->xconn;
        bool ok;
        NTSTATUS status;
        size_t unread = 0;
@@ -2911,7 +3012,7 @@ static void smbd_echo_read_waited(struct tevent_req *subreq)
                }
 
                subreq = wait_for_read_send(state, state->ev,
-                                           xconn->transport.sock);
+                                           xconn->transport.sock, false);
                if (tevent_req_nomem(subreq, req)) {
                        return;
                }
@@ -3070,7 +3171,7 @@ static bool smbd_echo_reply(struct smbd_echo_state *state,
                return false;
        }
 
-       if (!create_outbuf(talloc_tos(), &req, (const char *)req.inbuf, &outbuf,
+       if (!create_outbuf(talloc_tos(), &req, req.inbuf, &outbuf,
                           1, req.buflen)) {
                DEBUG(10, ("create_outbuf failed\n"));
                return false;
@@ -3083,7 +3184,7 @@ static bool smbd_echo_reply(struct smbd_echo_state *state,
                memcpy(smb_buf(req.outbuf), req.buf, req.buflen);
        }
 
-       ok = srv_send_smb(req.sconn,
+       ok = srv_send_smb(req.xconn,
                          (char *)outbuf,
                          true, seqnum+1,
                          false, &req.pcd);
@@ -3105,24 +3206,22 @@ static void smbd_echo_exit(struct tevent_context *ev,
 
 static void smbd_echo_got_packet(struct tevent_req *req);
 
-static void smbd_echo_loop(struct smbd_server_connection *sconn,
+static void smbd_echo_loop(struct smbXsrv_connection *xconn,
                           int parent_pipe)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
        struct smbd_echo_state *state;
        struct tevent_req *read_req;
 
-       state = talloc_zero(sconn, struct smbd_echo_state);
+       state = talloc_zero(xconn, struct smbd_echo_state);
        if (state == NULL) {
                DEBUG(1, ("talloc failed\n"));
                return;
        }
-       state->sconn = sconn;
        state->xconn = xconn;
        state->parent_pipe = parent_pipe;
-       state->ev = s3_tevent_context_init(state);
+       state->ev = samba_tevent_context_init(state);
        if (state->ev == NULL) {
-               DEBUG(1, ("tevent_context_init failed\n"));
+               DEBUG(1, ("samba_tevent_context_init failed\n"));
                TALLOC_FREE(state);
                return;
        }
@@ -3135,7 +3234,7 @@ static void smbd_echo_loop(struct smbd_server_connection *sconn,
                return;
        }
 
-       read_req = smbd_echo_read_send(state, state->ev, sconn);
+       read_req = smbd_echo_read_send(state, state->ev, xconn);
        if (read_req == NULL) {
                DEBUG(1, ("smbd_echo_read_send failed\n"));
                TALLOC_FREE(state);
@@ -3204,7 +3303,7 @@ static void smbd_echo_got_packet(struct tevent_req *req)
                smbd_echo_activate_writer(state);
        }
 
-       req = smbd_echo_read_send(state, state->ev, state->sconn);
+       req = smbd_echo_read_send(state, state->ev, state->xconn);
        if (req == NULL) {
                DEBUG(1, ("smbd_echo_read_send failed\n"));
                exit(1);
@@ -3216,9 +3315,8 @@ static void smbd_echo_got_packet(struct tevent_req *req)
 /*
  * Handle SMBecho requests in a forked child process
  */
-bool fork_echo_handler(struct smbd_server_connection *sconn)
+bool fork_echo_handler(struct smbXsrv_connection *xconn)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
        int listener_pipe[2];
        int res;
        pid_t child;
@@ -3299,15 +3397,17 @@ bool fork_echo_handler(struct smbd_server_connection *sconn)
                close(listener_pipe[0]);
                set_blocking(listener_pipe[1], false);
 
-               status = reinit_after_fork(sconn->msg_ctx,
-                                          sconn->ev_ctx,
-                                          true);
+               status = smbd_reinit_after_fork(xconn->client->msg_ctx,
+                                               xconn->client->raw_ev_ctx,
+                                               true,
+                                               "smbd-echo");
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(1, ("reinit_after_fork failed: %s\n",
                                  nt_errstr(status)));
                        exit(1);
                }
-               smbd_echo_loop(sconn, listener_pipe[1]);
+               initialize_password_db(true, xconn->client->raw_ev_ctx);
+               smbd_echo_loop(xconn, listener_pipe[1]);
                exit(0);
        }
        close(listener_pipe[1]);
@@ -3320,7 +3420,8 @@ bool fork_echo_handler(struct smbd_server_connection *sconn)
         * Without smb signing this is the same as the normal smbd
         * listener. This needs to change once signing comes in.
         */
-       xconn->smb1.echo_handler.trusted_fde = tevent_add_fd(xconn->ev_ctx,
+       xconn->smb1.echo_handler.trusted_fde = tevent_add_fd(
+                                       xconn->client->raw_ev_ctx,
                                        xconn,
                                        xconn->smb1.echo_handler.trusted_fd,
                                        TEVENT_FD_READ,
@@ -3459,64 +3560,98 @@ NTSTATUS smbXsrv_connection_init_tables(struct smbXsrv_connection *conn,
 {
        NTSTATUS status;
 
-       set_Protocol(protocol);
        conn->protocol = protocol;
 
+       if (conn->client->session_table != NULL) {
+               return NT_STATUS_OK;
+       }
+
        if (protocol >= PROTOCOL_SMB2_02) {
                status = smb2srv_session_table_init(conn);
                if (!NT_STATUS_IS_OK(status)) {
+                       conn->protocol = PROTOCOL_NONE;
                        return status;
                }
 
                status = smb2srv_open_table_init(conn);
                if (!NT_STATUS_IS_OK(status)) {
+                       conn->protocol = PROTOCOL_NONE;
                        return status;
                }
        } else {
                status = smb1srv_session_table_init(conn);
                if (!NT_STATUS_IS_OK(status)) {
+                       conn->protocol = PROTOCOL_NONE;
                        return status;
                }
 
                status = smb1srv_tcon_table_init(conn);
                if (!NT_STATUS_IS_OK(status)) {
+                       conn->protocol = PROTOCOL_NONE;
                        return status;
                }
 
                status = smb1srv_open_table_init(conn);
                if (!NT_STATUS_IS_OK(status)) {
+                       conn->protocol = PROTOCOL_NONE;
                        return status;
                }
        }
 
+       set_Protocol(protocol);
        return NT_STATUS_OK;
 }
 
+struct smbd_tevent_trace_state {
+       struct tevent_context *ev;
+       TALLOC_CTX *frame;
+       SMBPROFILE_BASIC_ASYNC_STATE(profile_idle);
+};
+
 static void smbd_tevent_trace_callback(enum tevent_trace_point point,
                                       void *private_data)
 {
-       struct smbXsrv_connection *conn =
-               talloc_get_type_abort(private_data,
-               struct smbXsrv_connection);
+       struct smbd_tevent_trace_state *state =
+               (struct smbd_tevent_trace_state *)private_data;
 
        switch (point) {
        case TEVENT_TRACE_BEFORE_WAIT:
-               /*
-                * This just removes compiler warning
-                * without profile support
-                */
-               conn->smbd_idle_profstamp = 0;
-               START_PROFILE_STAMP(smbd_idle, conn->smbd_idle_profstamp);
+               if (!smbprofile_dump_pending()) {
+                       /*
+                        * If there's no dump pending
+                        * we don't want to schedule a new 1 sec timer.
+                        *
+                        * Instead we want to sleep as long as nothing happens.
+                        */
+                       smbprofile_dump_setup(NULL);
+               }
+               SMBPROFILE_BASIC_ASYNC_START(idle, profile_p, state->profile_idle);
                break;
        case TEVENT_TRACE_AFTER_WAIT:
-               END_PROFILE_STAMP(smbd_idle, conn->smbd_idle_profstamp);
+               SMBPROFILE_BASIC_ASYNC_END(state->profile_idle);
+               if (!smbprofile_dump_pending()) {
+                       /*
+                        * We need to flush our state after sleeping
+                        * (hopefully a long time).
+                        */
+                       smbprofile_dump();
+                       /*
+                        * future profiling events should trigger timers
+                        * on our main event context.
+                        */
+                       smbprofile_dump_setup(state->ev);
+               }
                break;
-#ifdef TEVENT_HAS_LOOP_ONCE_TRACE_POINTS
        case TEVENT_TRACE_BEFORE_LOOP_ONCE:
+               TALLOC_FREE(state->frame);
+               state->frame = talloc_stackframe_pool(8192);
+               break;
        case TEVENT_TRACE_AFTER_LOOP_ONCE:
+               TALLOC_FREE(state->frame);
                break;
-#endif
        }
+
+       errno = 0;
 }
 
 /**
@@ -3542,18 +3677,11 @@ const char *smbXsrv_connection_dbg(const struct smbXsrv_connection *xconn)
        return ret;
 }
 
-/****************************************************************************
- Process commands from the client
-****************************************************************************/
-
-void smbd_process(struct tevent_context *ev_ctx,
-                 struct messaging_context *msg_ctx,
-                 int sock_fd,
-                 bool interactive)
+NTSTATUS smbd_add_connection(struct smbXsrv_client *client, int sock_fd,
+                            struct smbXsrv_connection **_xconn)
 {
        TALLOC_CTX *frame = talloc_stackframe();
        struct smbXsrv_connection *xconn;
-       struct smbd_server_connection *sconn;
        struct sockaddr_storage ss_srv;
        void *sp_srv = (void *)&ss_srv;
        struct sockaddr *sa_srv = (struct sockaddr *)sp_srv;
@@ -3563,62 +3691,27 @@ void smbd_process(struct tevent_context *ev_ctx,
        socklen_t sa_socklen;
        struct tsocket_address *local_address = NULL;
        struct tsocket_address *remote_address = NULL;
-       const char *locaddr = NULL;
        const char *remaddr = NULL;
-       char *rhost;
+       char *p;
+       const char *rhost = NULL;
        int ret;
        int tmp;
 
-       xconn = talloc_zero(ev_ctx, struct smbXsrv_connection);
+       *_xconn = NULL;
+
+       DO_PROFILE_INC(connect);
+
+       xconn = talloc_zero(client, struct smbXsrv_connection);
        if (xconn == NULL) {
                DEBUG(0,("talloc_zero(struct smbXsrv_connection)\n"));
-               exit_server_cleanly("talloc_zero(struct smbXsrv_connection).\n");
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
        }
+       talloc_steal(frame, xconn);
 
-       xconn->ev_ctx = ev_ctx;
-       xconn->msg_ctx = msg_ctx;
        xconn->transport.sock = sock_fd;
        smbd_echo_init(xconn);
-
-       sconn = talloc_zero(xconn, struct smbd_server_connection);
-       if (!sconn) {
-               exit_server("failed to create smbd_server_connection");
-       }
-
-       xconn->sconn = sconn;
-       sconn->conn = xconn;
-
-       /*
-        * TODO: remove this...:-)
-        */
-       global_smbXsrv_connection = xconn;
-
-       sconn->ev_ctx = ev_ctx;
-       sconn->msg_ctx = msg_ctx;
-
-       if (!interactive) {
-               smbd_setup_sig_term_handler(sconn);
-               smbd_setup_sig_hup_handler(sconn);
-
-               if (!serverid_register(messaging_server_id(msg_ctx),
-                                      FLAG_MSG_GENERAL|FLAG_MSG_SMBD
-                                      |FLAG_MSG_DBWRAP
-                                      |FLAG_MSG_PRINT_GENERAL)) {
-                       exit_server_cleanly("Could not register myself in "
-                                           "serverid.tdb");
-               }
-       }
-
-       if (lp_server_max_protocol() >= PROTOCOL_SMB2_02) {
-               /*
-                * We're not making the decision here,
-                * we're just allowing the client
-                * to decide between SMB1 and SMB2
-                * with the first negprot
-                * packet.
-                */
-               sconn->using_smb2 = true;
-       }
+       xconn->protocol = PROTOCOL_NONE;
 
        /* Ensure child is set to blocking mode */
        set_blocking(sock_fd,True);
@@ -3629,69 +3722,58 @@ void smbd_process(struct tevent_context *ev_ctx,
        sa_socklen = sizeof(ss_clnt);
        ret = getpeername(sock_fd, sa_clnt, &sa_socklen);
        if (ret != 0) {
+               int saved_errno = errno;
                int level = (errno == ENOTCONN)?2:0;
-               DEBUG(level,("getpeername() failed - %s\n", strerror(errno)));
-               exit_server_cleanly("getpeername() failed.\n");
+               DEBUG(level,("getpeername() failed - %s\n",
+                     strerror(saved_errno)));
+               TALLOC_FREE(frame);
+               return map_nt_error_from_unix_common(saved_errno);
        }
-       ret = tsocket_address_bsd_from_sockaddr(sconn,
+       ret = tsocket_address_bsd_from_sockaddr(xconn,
                                                sa_clnt, sa_socklen,
                                                &remote_address);
        if (ret != 0) {
+               int saved_errno = errno;
                DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",
-                       __location__, strerror(errno)));
-               exit_server_cleanly("tsocket_address_bsd_from_sockaddr remote failed.\n");
+                       __location__, strerror(saved_errno)));
+               TALLOC_FREE(frame);
+               return map_nt_error_from_unix_common(saved_errno);
        }
 
        sa_socklen = sizeof(ss_srv);
        ret = getsockname(sock_fd, sa_srv, &sa_socklen);
        if (ret != 0) {
+               int saved_errno = errno;
                int level = (errno == ENOTCONN)?2:0;
-               DEBUG(level,("getsockname() failed - %s\n", strerror(errno)));
-               exit_server_cleanly("getsockname() failed.\n");
+               DEBUG(level,("getsockname() failed - %s\n",
+                     strerror(saved_errno)));
+               TALLOC_FREE(frame);
+               return map_nt_error_from_unix_common(saved_errno);
        }
-       ret = tsocket_address_bsd_from_sockaddr(sconn,
+       ret = tsocket_address_bsd_from_sockaddr(xconn,
                                                sa_srv, sa_socklen,
                                                &local_address);
        if (ret != 0) {
+               int saved_errno = errno;
                DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",
-                       __location__, strerror(errno)));
-               exit_server_cleanly("tsocket_address_bsd_from_sockaddr remote failed.\n");
-       }
-
-       sconn->local_address = local_address;
-       sconn->remote_address = remote_address;
-
-       if (tsocket_address_is_inet(local_address, "ip")) {
-               locaddr = tsocket_address_inet_addr_string(
-                               sconn->local_address,
-                               talloc_tos());
-               if (locaddr == NULL) {
-                       DEBUG(0,("%s: tsocket_address_inet_addr_string local failed - %s\n",
-                                __location__, strerror(errno)));
-                       exit_server_cleanly("tsocket_address_inet_addr_string local failed.\n");
-               }
-       } else {
-               locaddr = "0.0.0.0";
+                       __location__, strerror(saved_errno)));
+               TALLOC_FREE(frame);
+               return map_nt_error_from_unix_common(saved_errno);
        }
 
        if (tsocket_address_is_inet(remote_address, "ip")) {
-               remaddr = tsocket_address_inet_addr_string(
-                               sconn->remote_address,
-                               talloc_tos());
+               remaddr = tsocket_address_inet_addr_string(remote_address,
+                                                          talloc_tos());
                if (remaddr == NULL) {
                        DEBUG(0,("%s: tsocket_address_inet_addr_string remote failed - %s\n",
                                 __location__, strerror(errno)));
-                       exit_server_cleanly("tsocket_address_inet_addr_string remote failed.\n");
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_NO_MEMORY;
                }
        } else {
                remaddr = "0.0.0.0";
        }
 
-       /* this is needed so that we get decent entries
-          in smbstatus for port 445 connects */
-       set_remote_machine_name(remaddr, false);
-       reload_services(sconn, conn_snum_used, true);
-
        /*
         * Before the first packet, check the global hosts allow/ hosts deny
         * parameters before doing any parsing of packets passed to us by the
@@ -3700,44 +3782,238 @@ void smbd_process(struct tevent_context *ev_ctx,
         */
 
        ret = get_remote_hostname(remote_address,
-                                 &rhost,
-                                 talloc_tos());
+                                 &p, talloc_tos());
        if (ret < 0) {
+               int saved_errno = errno;
                DEBUG(0,("%s: get_remote_hostname failed - %s\n",
-                       __location__, strerror(errno)));
-               exit_server_cleanly("get_remote_hostname failed.\n");
+                       __location__, strerror(saved_errno)));
+               TALLOC_FREE(frame);
+               return map_nt_error_from_unix_common(saved_errno);
        }
+       rhost = p;
        if (strequal(rhost, "UNKNOWN")) {
-               rhost = talloc_strdup(talloc_tos(), remaddr);
+               rhost = remaddr;
        }
-       sconn->remote_hostname = talloc_move(sconn, &rhost);
 
-       sub_set_socket_ids(remaddr,
-                          sconn->remote_hostname,
-                          locaddr);
+       xconn->local_address = local_address;
+       xconn->remote_address = remote_address;
+       xconn->remote_hostname = talloc_strdup(xconn, rhost);
+       if (xconn->remote_hostname == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!srv_init_signing(xconn)) {
+               DEBUG(0, ("Failed to init smb_signing\n"));
+               TALLOC_FREE(frame);
+               return NT_STATUS_INTERNAL_ERROR;
+       }
 
        if (!allow_access(lp_hosts_deny(-1), lp_hosts_allow(-1),
-                         sconn->remote_hostname,
+                         xconn->remote_hostname,
                          remaddr)) {
+               DEBUG( 1, ("Connection denied from %s to %s\n",
+                          tsocket_address_string(remote_address, talloc_tos()),
+                          tsocket_address_string(local_address, talloc_tos())));
+
+               /*
+                * We return a valid xconn
+                * so that the caller can return an error message
+                * to the client
+                */
+               client->connections = xconn;
+               xconn->client = client;
+               talloc_steal(client, xconn);
+
+               *_xconn = xconn;
+               TALLOC_FREE(frame);
+               return NT_STATUS_NETWORK_ACCESS_DENIED;
+       }
+
+       DEBUG(10, ("Connection allowed from %s to %s\n",
+                  tsocket_address_string(remote_address, talloc_tos()),
+                  tsocket_address_string(local_address, talloc_tos())));
+
+       if (lp_clustering()) {
+               /*
+                * We need to tell ctdb about our client's TCP
+                * connection, so that for failover ctdbd can send
+                * tickle acks, triggering a reconnection by the
+                * client.
+                */
+               NTSTATUS status;
+
+               status = smbd_register_ips(xconn, &ss_srv, &ss_clnt);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("ctdbd_register_ips failed: %s\n",
+                                 nt_errstr(status)));
+               }
+       }
+
+       tmp = lp_max_xmit();
+       tmp = MAX(tmp, SMB_BUFFER_SIZE_MIN);
+       tmp = MIN(tmp, SMB_BUFFER_SIZE_MAX);
+
+       xconn->smb1.negprot.max_recv = tmp;
+
+       xconn->smb1.sessions.done_sesssetup = false;
+       xconn->smb1.sessions.max_send = SMB_BUFFER_SIZE_MAX;
+
+       xconn->transport.fde = tevent_add_fd(client->raw_ev_ctx,
+                                            xconn,
+                                            sock_fd,
+                                            TEVENT_FD_READ,
+                                            smbd_server_connection_handler,
+                                            xconn);
+       if (!xconn->transport.fde) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* for now we only have one connection */
+       DLIST_ADD_END(client->connections, xconn);
+       xconn->client = client;
+       talloc_steal(client, xconn);
+
+       *_xconn = xconn;
+       TALLOC_FREE(frame);
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Process commands from the client
+****************************************************************************/
+
+void smbd_process(struct tevent_context *ev_ctx,
+                 struct messaging_context *msg_ctx,
+                 int sock_fd,
+                 bool interactive)
+{
+       struct smbd_tevent_trace_state trace_state = {
+               .ev = ev_ctx,
+               .frame = talloc_stackframe(),
+       };
+       struct smbXsrv_client *client = NULL;
+       struct smbd_server_connection *sconn = NULL;
+       struct smbXsrv_connection *xconn = NULL;
+       const char *locaddr = NULL;
+       const char *remaddr = NULL;
+       int ret;
+       NTSTATUS status;
+       struct timeval tv = timeval_current();
+       NTTIME now = timeval_to_nttime(&tv);
+       char *chroot_dir = NULL;
+       int rc;
+
+       status = smbXsrv_client_create(ev_ctx, ev_ctx, msg_ctx, now, &client);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_ERR("smbXsrv_client_create(): %s\n", nt_errstr(status));
+               exit_server_cleanly("talloc_zero(struct smbXsrv_client).\n");
+       }
+
+       /*
+        * TODO: remove this...:-)
+        */
+       global_smbXsrv_client = client;
+
+       sconn = talloc_zero(client, struct smbd_server_connection);
+       if (sconn == NULL) {
+               exit_server("failed to create smbd_server_connection");
+       }
+
+       client->sconn = sconn;
+       sconn->client = client;
+
+       sconn->ev_ctx = ev_ctx;
+       sconn->msg_ctx = msg_ctx;
+
+       ret = pthreadpool_tevent_init(sconn, lp_aio_max_threads(),
+                                     &sconn->pool);
+       if (ret != 0) {
+               exit_server("pthreadpool_tevent_init() failed.");
+       }
+
+       if (lp_server_max_protocol() >= PROTOCOL_SMB2_02) {
+               /*
+                * We're not making the decision here,
+                * we're just allowing the client
+                * to decide between SMB1 and SMB2
+                * with the first negprot
+                * packet.
+                */
+               sconn->using_smb2 = true;
+       }
+
+       if (!interactive) {
+               smbd_setup_sig_term_handler(sconn);
+               smbd_setup_sig_hup_handler(sconn);
+       }
+
+       status = smbd_add_connection(client, sock_fd, &xconn);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
                /*
                 * send a negative session response "not listening on calling
                 * name"
                 */
                unsigned char buf[5] = {0x83, 0, 0, 1, 0x81};
-               DEBUG( 1, ("Connection denied from %s to %s\n",
-                          tsocket_address_string(remote_address, talloc_tos()),
-                          tsocket_address_string(local_address, talloc_tos())));
-               (void)srv_send_smb(sconn,(char *)buf, false,
+               (void)srv_send_smb(xconn,(char *)buf, false,
                                   0, false, NULL);
                exit_server_cleanly("connection denied");
+       } else if (!NT_STATUS_IS_OK(status)) {
+               exit_server_cleanly(nt_errstr(status));
        }
 
-       DEBUG(10, ("Connection allowed from %s to %s\n",
-                  tsocket_address_string(remote_address, talloc_tos()),
-                  tsocket_address_string(local_address, talloc_tos())));
+       sconn->local_address =
+               tsocket_address_copy(xconn->local_address, sconn);
+       if (sconn->local_address == NULL) {
+               exit_server_cleanly("tsocket_address_copy() failed");
+       }
+       sconn->remote_address =
+               tsocket_address_copy(xconn->remote_address, sconn);
+       if (sconn->remote_address == NULL) {
+               exit_server_cleanly("tsocket_address_copy() failed");
+       }
+       sconn->remote_hostname =
+               talloc_strdup(sconn, xconn->remote_hostname);
+       if (sconn->remote_hostname == NULL) {
+               exit_server_cleanly("tsocket_strdup() failed");
+       }
+
+       if (tsocket_address_is_inet(sconn->local_address, "ip")) {
+               locaddr = tsocket_address_inet_addr_string(
+                               sconn->local_address,
+                               talloc_tos());
+               if (locaddr == NULL) {
+                       DEBUG(0,("%s: tsocket_address_inet_addr_string remote failed - %s\n",
+                                __location__, strerror(errno)));
+                       exit_server_cleanly("tsocket_address_inet_addr_string remote failed.\n");
+               }
+       } else {
+               locaddr = "0.0.0.0";
+       }
+
+       if (tsocket_address_is_inet(sconn->remote_address, "ip")) {
+               remaddr = tsocket_address_inet_addr_string(
+                               sconn->remote_address,
+                               talloc_tos());
+               if (remaddr == NULL) {
+                       DEBUG(0,("%s: tsocket_address_inet_addr_string remote failed - %s\n",
+                                __location__, strerror(errno)));
+                       exit_server_cleanly("tsocket_address_inet_addr_string remote failed.\n");
+               }
+       } else {
+               remaddr = "0.0.0.0";
+       }
+
+       /* this is needed so that we get decent entries
+          in smbstatus for port 445 connects */
+       set_remote_machine_name(remaddr, false);
+       reload_services(sconn, conn_snum_used, true);
+       sub_set_socket_ids(remaddr,
+                          sconn->remote_hostname,
+                          locaddr);
 
        if (lp_preload_modules()) {
-               smb_load_modules(lp_preload_modules());
+               smb_load_all_modules_absoute_path(lp_preload_modules());
        }
 
        smb_perfcount_init();
@@ -3746,21 +4022,22 @@ void smbd_process(struct tevent_context *ev_ctx,
                exit_server("Could not open account policy tdb.\n");
        }
 
-       if (*lp_root_directory(talloc_tos())) {
-               if (chroot(lp_root_directory(talloc_tos())) != 0) {
-                       DEBUG(0,("Failed to change root to %s\n",
-                                lp_root_directory(talloc_tos())));
-                       exit_server("Failed to chroot()");
+       chroot_dir = lp_root_directory(talloc_tos());
+       if (chroot_dir[0] != '\0') {
+               rc = chdir(chroot_dir);
+               if (rc != 0) {
+                       DBG_ERR("Failed to chdir to %s\n", chroot_dir);
+                       exit_server("Failed to chdir()");
                }
-               if (chdir("/") == -1) {
-                       DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_root_directory(talloc_tos())));
+
+               rc = chroot(chroot_dir);
+               if (rc != 0) {
+                       DBG_ERR("Failed to change root to %s\n", chroot_dir);
                        exit_server("Failed to chroot()");
                }
-               DEBUG(0,("Changed root to %s\n", lp_root_directory(talloc_tos())));
-       }
+               DBG_WARNING("Changed root to %s\n", chroot_dir);
 
-       if (!srv_init_signing(xconn)) {
-               exit_server("Failed to init smb_signing");
+               TALLOC_FREE(chroot_dir);
        }
 
        if (!file_init(sconn)) {
@@ -3829,69 +4106,25 @@ void smbd_process(struct tevent_context *ev_ctx,
                exit(1);
        }
 
-       if (lp_clustering()) {
-               /*
-                * We need to tell ctdb about our client's TCP
-                * connection, so that for failover ctdbd can send
-                * tickle acks, triggering a reconnection by the
-                * client.
-                */
-               NTSTATUS status;
-
-               status = smbd_register_ips(xconn, &ss_srv, &ss_clnt);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("ctdbd_register_ips failed: %s\n",
-                                 nt_errstr(status)));
-               }
-       }
-
-       tmp = lp_max_xmit();
-       tmp = MAX(tmp, SMB_BUFFER_SIZE_MIN);
-       tmp = MIN(tmp, SMB_BUFFER_SIZE_MAX);
-
-       xconn->smb1.negprot.max_recv = tmp;
-
-       xconn->smb1.sessions.done_sesssetup = false;
-       xconn->smb1.sessions.max_send = SMB_BUFFER_SIZE_MAX;
+       smbprofile_dump_setup(ev_ctx);
 
        if (!init_dptrs(sconn)) {
                exit_server("init_dptrs() failed");
        }
 
-       xconn->transport.fde = tevent_add_fd(ev_ctx,
-                                            xconn,
-                                            sock_fd,
-                                            TEVENT_FD_READ,
-                                            smbd_server_connection_handler,
-                                            xconn);
-       if (!xconn->transport.fde) {
-               exit_server("failed to create smbd_server_connection fde");
-       }
-
-       sconn->conn->local_address = sconn->local_address;
-       sconn->conn->remote_address = sconn->remote_address;
-       sconn->conn->remote_hostname = sconn->remote_hostname;
-       sconn->conn->protocol = PROTOCOL_NONE;
-
-       TALLOC_FREE(frame);
-
-       tevent_set_trace_callback(ev_ctx, smbd_tevent_trace_callback, xconn);
-
-       while (True) {
-               frame = talloc_stackframe_pool(8192);
+       TALLOC_FREE(trace_state.frame);
 
-               errno = 0;
-               if (tevent_loop_once(ev_ctx) == -1) {
-                       if (errno != EINTR) {
-                               DEBUG(3, ("tevent_loop_once failed: %s,"
-                                         " exiting\n", strerror(errno) ));
-                               break;
-                       }
-               }
+       tevent_set_trace_callback(ev_ctx, smbd_tevent_trace_callback,
+                                 &trace_state);
 
-               TALLOC_FREE(frame);
+       ret = tevent_loop_wait(ev_ctx);
+       if (ret != 0) {
+               DEBUG(1, ("tevent_loop_wait failed: %d, %s,"
+                         " exiting\n", ret, strerror(errno)));
        }
 
+       TALLOC_FREE(trace_state.frame);
+
        exit_server_cleanly(NULL);
 }