Fix bug 8710 - connections.tdb - major leak with SMB2.
[amitay/samba.git] / source3 / smbd / service.c
index e713b7132e9024d23b26f4d96985fa600cb1574c..4d55977ad2e32531672570c4cd47079fd719f2f5 100644 (file)
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "system/passwd.h" /* uid_wrapper */
+#include "../lib/tsocket/tsocket.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
 #include "printing/pcap.h"
+#include "passdb/lookup_sid.h"
+#include "auth.h"
+#include "lib/param/loadparm.h"
+#include "messages.h"
 
 extern userdom_struct current_user_info;
 
@@ -217,243 +225,27 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir)
        return(True);
 }
 
-static int load_registry_service(const char *servicename)
-{
-       if (!lp_registry_shares()) {
-               return -1;
-       }
-
-       if ((servicename == NULL) || (*servicename == '\0')) {
-               return -1;
-       }
-
-       if (strequal(servicename, GLOBAL_NAME)) {
-               return -2;
-       }
-
-       if (!process_registry_service(servicename)) {
-               return -1;
-       }
-
-       return lp_servicenumber(servicename);
-}
-
-void load_registry_shares(void)
-{
-       DEBUG(8, ("load_registry_shares()\n"));
-       if (!lp_registry_shares()) {
-               return;
-       }
-
-       process_registry_shares();
-
-       return;
-}
-
-/****************************************************************************
- Add a home service. Returns the new service number or -1 if fail.
-****************************************************************************/
-
-int add_home_service(const char *service, const char *username, const char *homedir)
-{
-       int iHomeService;
-
-       if (!service || !homedir || homedir[0] == '\0')
-               return -1;
-
-       if ((iHomeService = lp_servicenumber(HOMES_NAME)) < 0) {
-               if ((iHomeService = load_registry_service(HOMES_NAME)) < 0) {
-                       return -1;
-               }
-       }
-
-       /*
-        * If this is a winbindd provided username, remove
-        * the domain component before adding the service.
-        * Log a warning if the "path=" parameter does not
-        * include any macros.
-        */
-
-       {
-               const char *p = strchr(service,*lp_winbind_separator());
-
-               /* We only want the 'user' part of the string */
-               if (p) {
-                       service = p + 1;
-               }
-       }
-
-       if (!lp_add_home(service, iHomeService, username, homedir)) {
-               return -1;
-       }
-
-       return lp_servicenumber(service);
-
-}
-
-/**
- * Find a service entry.
- *
- * @param service is modified (to canonical form??)
- **/
-
-int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out)
-{
-       int iService;
-
-       if (!service_in) {
-               return -1;
-       }
-
-       /* First make a copy. */
-       *p_service_out = talloc_strdup(ctx, service_in);
-       if (!*p_service_out) {
-               return -1;
-       }
-
-       all_string_sub(*p_service_out,"\\","/",0);
-
-       iService = lp_servicenumber(*p_service_out);
-
-       /* now handle the special case of a home directory */
-       if (iService < 0) {
-               char *phome_dir = get_user_home_dir(ctx, *p_service_out);
-
-               if(!phome_dir) {
-                       /*
-                        * Try mapping the servicename, it may
-                        * be a Windows to unix mapped user name.
-                        */
-                       if(map_username(ctx, *p_service_out, p_service_out)) {
-                               if (*p_service_out == NULL) {
-                                       /* Out of memory. */
-                                       return -1;
-                               }
-                               phome_dir = get_user_home_dir(
-                                               ctx, *p_service_out);
-                       }
-               }
-
-               DEBUG(3,("checking for home directory %s gave %s\n",*p_service_out,
-                       phome_dir?phome_dir:"(NULL)"));
-
-               iService = add_home_service(*p_service_out,*p_service_out /* 'username' */, phome_dir);
-       }
-
-       /* If we still don't have a service, attempt to add it as a printer. */
-       if (iService < 0) {
-               int iPrinterService;
-
-               if ((iPrinterService = lp_servicenumber(PRINTERS_NAME)) < 0) {
-                       iPrinterService = load_registry_service(PRINTERS_NAME);
-               }
-               if (iPrinterService >= 0) {
-                       DEBUG(3,("checking whether %s is a valid printer name...\n",
-                               *p_service_out));
-                       if (pcap_printername_ok(*p_service_out)) {
-                               DEBUG(3,("%s is a valid printer name\n",
-                                       *p_service_out));
-                               DEBUG(3,("adding %s as a printer service\n",
-                                       *p_service_out));
-                               lp_add_printer(*p_service_out, iPrinterService);
-                               iService = lp_servicenumber(*p_service_out);
-                               if (iService < 0) {
-                                       DEBUG(0,("failed to add %s as a printer service!\n",
-                                               *p_service_out));
-                               }
-                       } else {
-                               DEBUG(3,("%s is not a valid printer name\n",
-                                       *p_service_out));
-                       }
-               }
-       }
-
-       /* Check for default vfs service?  Unsure whether to implement this */
-       if (iService < 0) {
-       }
-
-       if (iService < 0) {
-               iService = load_registry_service(*p_service_out);
-       }
-
-       /* Is it a usershare service ? */
-       if (iService < 0 && *lp_usershare_path()) {
-               /* Ensure the name is canonicalized. */
-               strlower_m(*p_service_out);
-               iService = load_usershare_service(*p_service_out);
-       }
-
-       /* just possibly it's a default service? */
-       if (iService < 0) {
-               char *pdefservice = lp_defaultservice();
-               if (pdefservice &&
-                               *pdefservice &&
-                               !strequal(pdefservice, *p_service_out)
-                               && !strstr_m(*p_service_out,"..")) {
-                       /*
-                        * We need to do a local copy here as lp_defaultservice() 
-                        * returns one of the rotating lp_string buffers that
-                        * could get overwritten by the recursive find_service() call
-                        * below. Fix from Josef Hinteregger <joehtg@joehtg.co.at>.
-                        */
-                       char *defservice = talloc_strdup(ctx, pdefservice);
-
-                       if (!defservice) {
-                               goto fail;
-                       }
-
-                       /* Disallow anything except explicit share names. */
-                       if (strequal(defservice,HOMES_NAME) ||
-                                       strequal(defservice, PRINTERS_NAME) ||
-                                       strequal(defservice, "IPC$")) {
-                               TALLOC_FREE(defservice);
-                               goto fail;
-                       }
-
-                       iService = find_service(ctx, defservice, p_service_out);
-                       if (!*p_service_out) {
-                               TALLOC_FREE(defservice);
-                               iService = -1;
-                               goto fail;
-                       }
-                       if (iService >= 0) {
-                               all_string_sub(*p_service_out, "_","/",0);
-                               iService = lp_add_service(*p_service_out, iService);
-                       }
-                       TALLOC_FREE(defservice);
-               }
-       }
-
-       if (iService >= 0) {
-               if (!VALID_SNUM(iService)) {
-                       DEBUG(0,("Invalid snum %d for %s\n",iService,
-                               *p_service_out));
-                       iService = -1;
-               }
-       }
-
-  fail:
-
-       if (iService < 0) {
-               DEBUG(3,("find_service() failed to find service %s\n",
-                       *p_service_out));
-       }
-
-       return (iService);
-}
-
-
 /****************************************************************************
  do some basic sainity checks on the share.  
  This function modifies dev, ecode.
 ****************************************************************************/
 
-static NTSTATUS share_sanity_checks(struct client_address *client_id, int snum,
+static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address,
+                                   const char *rhost,
+                                   int snum,
                                    fstring dev)
 {
-       if (!lp_snum_ok(snum) || 
+       char *raddr;
+
+       raddr = tsocket_address_inet_addr_string(remote_address,
+                                                talloc_tos());
+       if (raddr == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!lp_snum_ok(snum) ||
            !allow_access(lp_hostsdeny(snum), lp_hostsallow(snum),
-                         client_id->name, client_id->addr)) {
+                         rhost, raddr)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
@@ -583,48 +375,48 @@ static NTSTATUS find_forced_group(bool force_user,
 }
 
 /****************************************************************************
-  Create an auth_serversupplied_info structure for a connection_struct
+  Create an auth_session_info structure for a connection_struct
 ****************************************************************************/
 
 static NTSTATUS create_connection_session_info(struct smbd_server_connection *sconn,
                                              TALLOC_CTX *mem_ctx, int snum,
-                                              struct auth_serversupplied_info *vuid_serverinfo,
+                                              struct auth_session_info *vuid_serverinfo,
                                              DATA_BLOB password,
-                                              struct auth_serversupplied_info **presult)
+                                              struct auth_session_info **presult)
 {
         if (lp_guest_only(snum)) {
-                return make_server_info_guest(mem_ctx, presult);
+                return make_session_info_guest(mem_ctx, presult);
         }
 
         if (vuid_serverinfo != NULL) {
 
-               struct auth_serversupplied_info *result;
+               struct auth_session_info *result;
 
                 /*
                  * This is the normal security != share case where we have a
                  * valid vuid from the session setup.                 */
 
-                if (vuid_serverinfo->guest) {
-                        if (!lp_guest_ok(snum)) {
+               if (security_session_user_level(vuid_serverinfo, NULL) < SECURITY_USER) {
+                      if (!lp_guest_ok(snum)) {
                                 DEBUG(2, ("guest user (from session setup) "
                                           "not permitted to access this share "
                                           "(%s)\n", lp_servicename(snum)));
                                 return NT_STATUS_ACCESS_DENIED;
                         }
                 } else {
-                        if (!user_ok_token(vuid_serverinfo->unix_name,
-                                          vuid_serverinfo->info3->base.domain.string,
+                        if (!user_ok_token(vuid_serverinfo->unix_info->unix_name,
+                                          vuid_serverinfo->info->domain_name,
                                            vuid_serverinfo->security_token, snum)) {
                                 DEBUG(2, ("user '%s' (from session setup) not "
                                           "permitted to access this share "
                                           "(%s)\n",
-                                          vuid_serverinfo->unix_name,
+                                          vuid_serverinfo->unix_info->unix_name,
                                           lp_servicename(snum)));
                                 return NT_STATUS_ACCESS_DENIED;
                         }
                 }
 
-                result = copy_serverinfo(mem_ctx, vuid_serverinfo);
+                result = copy_session_info(mem_ctx, vuid_serverinfo);
                if (result == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -651,27 +443,97 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc
                        return NT_STATUS_WRONG_PASSWORD;
                 }
 
-               return make_serverinfo_from_username(mem_ctx, user, guest,
-                                                    presult);
+               return make_session_info_from_username(mem_ctx, user, guest,
+                                                      presult);
         }
 
        DEBUG(0, ("invalid VUID (vuser) but not in security=share\n"));
        return NT_STATUS_ACCESS_DENIED;
 }
 
+/****************************************************************************
+  set relavent user and group settings corresponding to force user/group
+  configuration for the given snum.
+****************************************************************************/
+
+NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum)
+{
+       NTSTATUS status;
+
+       if (*lp_force_user(snum)) {
+
+               /*
+                * Replace conn->session_info with a completely faked up one
+                * from the username we are forced into :-)
+                */
+
+               char *fuser;
+               struct auth_session_info *forced_serverinfo;
+               bool guest;
+
+               fuser = talloc_string_sub(conn, lp_force_user(snum), "%S",
+                                         lp_const_servicename(snum));
+               if (fuser == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               guest = security_session_user_level(conn->session_info, NULL) < SECURITY_USER;
+
+               status = make_session_info_from_username(
+                       conn, fuser,
+                       guest,
+                       &forced_serverinfo);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               TALLOC_FREE(conn->session_info);
+               conn->session_info = forced_serverinfo;
+
+               conn->force_user = true;
+               DEBUG(3,("Forced user %s\n", fuser));
+       }
+
+       /*
+        * If force group is true, then override
+        * any groupid stored for the connecting user.
+        */
+
+       if (*lp_force_group(snum)) {
+
+               status = find_forced_group(
+                       conn->force_user, snum, conn->session_info->unix_info->unix_name,
+                       &conn->session_info->security_token->sids[1],
+                       &conn->session_info->unix_token->gid);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               /*
+                * We need to cache this gid, to use within
+                * change_to_user() separately from the conn->session_info
+                * struct. We only use conn->session_info directly if
+                * "force_user" was set.
+                */
+               conn->force_group_gid = conn->session_info->unix_token->gid;
+       }
+
+       return NT_STATUS_OK;
+}
 
 /****************************************************************************
   Make a connection, given the snum to connect to, and the vuser of the
   connecting user if appropriate.
 ****************************************************************************/
 
-connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
+static connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
+                                       connection_struct *conn,
                                        int snum, user_struct *vuser,
                                        DATA_BLOB password,
                                        const char *pdev,
                                        NTSTATUS *pstatus)
 {
-       connection_struct *conn = NULL;
        struct smb_filename *smb_fname_cpath = NULL;
        fstring dev;
        int ret;
@@ -683,18 +545,14 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 
        fstrcpy(dev, pdev);
 
-       *pstatus = share_sanity_checks(&sconn->client_id, snum, dev);
+       *pstatus = share_sanity_checks(sconn->remote_address,
+                                      sconn->remote_hostname,
+                                      snum,
+                                      dev);
        if (NT_STATUS_IS_ERR(*pstatus)) {
                goto err_root_exit;
        }
 
-       conn = conn_new(sconn);
-       if (!conn) {
-               DEBUG(0,("Couldn't find free connection.\n"));
-               *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
-               goto err_root_exit;
-       }
-
        conn->params->service = snum;
 
        status = create_connection_session_info(sconn,
@@ -712,7 +570,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
                conn->force_user = true;
        }
 
-       add_session_user(sconn, conn->session_info->unix_name);
+       add_session_user(sconn, conn->session_info->unix_info->unix_name);
 
        conn->num_files_open = 0;
        conn->lastused = conn->lastused_count = time(NULL);
@@ -742,62 +600,10 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 
        conn->read_only = lp_readonly(SNUM(conn));
 
-       if (*lp_force_user(snum)) {
-
-               /*
-                * Replace conn->session_info with a completely faked up one
-                * from the username we are forced into :-)
-                */
-
-               char *fuser;
-               struct auth_serversupplied_info *forced_serverinfo;
-
-               fuser = talloc_string_sub(conn, lp_force_user(snum), "%S",
-                                         lp_servicename(snum));
-               if (fuser == NULL) {
-                       *pstatus = NT_STATUS_NO_MEMORY;
-                       goto err_root_exit;
-               }
-
-               status = make_serverinfo_from_username(
-                       conn, fuser, conn->session_info->guest,
-                       &forced_serverinfo);
-               if (!NT_STATUS_IS_OK(status)) {
-                       *pstatus = status;
-                       goto err_root_exit;
-               }
-
-               TALLOC_FREE(conn->session_info);
-               conn->session_info = forced_serverinfo;
-
-               conn->force_user = True;
-               DEBUG(3,("Forced user %s\n", fuser));
-       }
-
-       /*
-        * If force group is true, then override
-        * any groupid stored for the connecting user.
-        */
-
-       if (*lp_force_group(snum)) {
-
-               status = find_forced_group(
-                       conn->force_user, snum, conn->session_info->unix_name,
-                       &conn->session_info->security_token->sids[1],
-                       &conn->session_info->utok.gid);
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       *pstatus = status;
-                       goto err_root_exit;
-               }
-
-               /*
-                * We need to cache this gid, to use within
-                * change_to_user() separately from the conn->session_info
-                * struct. We only use conn->session_info directly if
-                * "force_user" was set.
-                */
-               conn->force_group_gid = conn->session_info->utok.gid;
+       status = set_conn_force_user_group(conn, snum);
+       if (!NT_STATUS_IS_OK(status)) {
+               *pstatus = status;
+               return NULL;
        }
 
        conn->vuid = (vuser != NULL) ? vuser->vuid : UID_FIELD_INVALID;
@@ -805,11 +611,11 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
        {
                char *s = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->session_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->session_info->utok.gid,
-                                       conn->session_info->sanitized_username,
-                                       conn->session_info->info3->base.domain.string,
+                                       conn->session_info->unix_token->gid,
+                                       conn->session_info->unix_info->sanitized_username,
+                                       conn->session_info->info->domain_name,
                                        lp_pathname(snum));
                if (!s) {
                        *pstatus = NT_STATUS_NO_MEMORY;
@@ -833,27 +639,21 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
         *
         */
 
-       {
-               bool can_write = False;
-
-               can_write = share_access_check(conn->session_info->security_token,
-                                              lp_servicename(snum),
-                                              FILE_WRITE_DATA);
-
-               if (!can_write) {
-                       if (!share_access_check(conn->session_info->security_token,
-                                               lp_servicename(snum),
-                                               FILE_READ_DATA)) {
-                               /* No access, read or write. */
-                               DEBUG(0,("make_connection: connection to %s "
-                                        "denied due to security "
-                                        "descriptor.\n",
-                                         lp_servicename(snum)));
-                               *pstatus = NT_STATUS_ACCESS_DENIED;
-                               goto err_root_exit;
-                       } else {
-                               conn->read_only = True;
-                       }
+       share_access_check(conn->session_info->security_token,
+                          lp_servicename(snum), MAXIMUM_ALLOWED_ACCESS,
+                          &conn->share_access);
+
+       if ((conn->share_access & FILE_WRITE_DATA) == 0) {
+               if ((conn->share_access & FILE_READ_DATA) == 0) {
+                       /* No access, read or write. */
+                       DEBUG(0,("make_connection: connection to %s "
+                                "denied due to security "
+                                "descriptor.\n",
+                                lp_servicename(snum)));
+                       *pstatus = NT_STATUS_ACCESS_DENIED;
+                       goto err_root_exit;
+               } else {
+                       conn->read_only = True;
                }
        }
        /* Initialise VFS function pointers */
@@ -898,7 +698,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
           filesystem operation that we do. */
 
        if (SMB_VFS_CONNECT(conn, lp_servicename(snum),
-                           conn->session_info->unix_name) < 0) {
+                           conn->session_info->unix_info->unix_name) < 0) {
                DEBUG(0,("make_connection: VFS make connection failed!\n"));
                *pstatus = NT_STATUS_UNSUCCESSFUL;
                goto err_root_exit;
@@ -909,9 +709,9 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 
        if ((!conn->printer) && (!conn->ipc)) {
                conn->notify_ctx = notify_init(conn,
-                                              sconn_server_id(sconn),
+                                              messaging_server_id(sconn->msg_ctx),
                                               sconn->msg_ctx,
-                                              smbd_event_context(),
+                                              sconn->ev_ctx,
                                               conn);
        }
 
@@ -933,11 +733,11 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
        if (*lp_rootpreexec(snum)) {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->session_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->session_info->utok.gid,
-                                       conn->session_info->sanitized_username,
-                                       conn->session_info->info3->base.domain.string,
+                                       conn->session_info->unix_token->gid,
+                                       conn->session_info->unix_info->sanitized_username,
+                                       conn->session_info->info->domain_name,
                                        lp_rootpreexec(snum));
                DEBUG(5,("cmd=%s\n",cmd));
                ret = smbrun(cmd,NULL);
@@ -971,11 +771,11 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
        if (*lp_preexec(snum)) {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->session_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->session_info->utok.gid,
-                                       conn->session_info->sanitized_username,
-                                       conn->session_info->info3->base.domain.string,
+                                       conn->session_info->unix_token->gid,
+                                       conn->session_info->unix_info->sanitized_username,
+                                       conn->session_info->info->domain_name,
                                        lp_preexec(snum));
                ret = smbrun(cmd,NULL);
                TALLOC_FREE(cmd);
@@ -1074,11 +874,12 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 
        if( DEBUGLVL( IS_IPC(conn) ? 3 : 1 ) ) {
                dbgtext( "%s (%s) ", get_remote_machine_name(),
-                        conn->sconn->client_id.addr );
+                        tsocket_address_string(conn->sconn->remote_address,
+                                               talloc_tos()) );
                dbgtext( "%s", srv_is_signing_active(sconn) ? "signed " : "");
                dbgtext( "connect to service %s ", lp_servicename(snum) );
                dbgtext( "initially as user %s ",
-                        conn->session_info->unix_name );
+                        conn->session_info->unix_info->unix_name );
                dbgtext( "(uid=%d, gid=%d) ", (int)effuid, (int)effgid );
                dbgtext( "(pid %d)\n", (int)sys_getpid() );
        }
@@ -1098,14 +899,76 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
        if (claimed_connection) {
                yield_connection(conn, lp_servicename(snum));
        }
-       if (conn) {
+       return NULL;
+}
+
+/****************************************************************************
+ Make a connection to a service from SMB1. Internal interface.
+****************************************************************************/
+
+static connection_struct *make_connection_smb1(struct smbd_server_connection *sconn,
+                                       int snum, user_struct *vuser,
+                                       DATA_BLOB password,
+                                       const char *pdev,
+                                       NTSTATUS *pstatus)
+{
+       connection_struct *ret_conn = NULL;
+       connection_struct *conn = conn_new(sconn);
+       if (!conn) {
+               DEBUG(0,("make_connection_smb1: Couldn't find free connection.\n"));
+               *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
+               return NULL;
+       }
+       ret_conn = make_connection_snum(sconn,
+                                       conn,
+                                       snum,
+                                       vuser,
+                                        password,
+                                       pdev,
+                                       pstatus);
+       if (ret_conn != conn) {
                conn_free(conn);
+               return NULL;
        }
-       return NULL;
+       return conn;
+}
+
+/****************************************************************************
+ Make a connection to a service from SMB2. External SMB2 interface.
+ We must set cnum before claiming connection.
+****************************************************************************/
+
+connection_struct *make_connection_smb2(struct smbd_server_connection *sconn,
+                                       struct smbd_smb2_tcon *tcon,
+                                       user_struct *vuser,
+                                       DATA_BLOB password,
+                                       const char *pdev,
+                                       NTSTATUS *pstatus)
+{
+       connection_struct *ret_conn = NULL;
+       connection_struct *conn = conn_new(sconn);
+       if (!conn) {
+               DEBUG(0,("make_connection_smb2: Couldn't find free connection.\n"));
+               *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
+               return NULL;
+       }
+       conn->cnum = tcon->tid;
+       ret_conn = make_connection_snum(sconn,
+                                       conn,
+                                       tcon->snum,
+                                       vuser,
+                                        password,
+                                       pdev,
+                                       pstatus);
+       if (ret_conn != conn) {
+               conn_free(conn);
+               return NULL;
+       }
+       return conn;
 }
 
 /****************************************************************************
- Make a connection to a service.
+ Make a connection to a service. External SMB1 interface.
  *
  * @param service 
 ****************************************************************************/
@@ -1168,7 +1031,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
                        }
                        DEBUG(5, ("making a connection to [homes] service "
                                  "created at session setup time\n"));
-                       return make_connection_snum(sconn,
+                       return make_connection_smb1(sconn,
                                                    vuser->homes_snum,
                                                    vuser, no_pw, 
                                                    dev, status);
@@ -1192,7 +1055,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
                                DEBUG(5, ("making a connection to 'homes' "
                                          "service %s based on "
                                          "security=share\n", service_in));
-                               return make_connection_snum(sconn,
+                               return make_connection_smb1(sconn,
                                                            snum, NULL,
                                                            password,
                                                            dev, status);
@@ -1204,7 +1067,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
                DATA_BLOB no_pw = data_blob_null;
                DEBUG(5, ("making a connection to 'homes' service [%s] "
                          "created at session setup time\n", service_in));
-               return make_connection_snum(sconn,
+               return make_connection_smb1(sconn,
                                            vuser->homes_snum,
                                            vuser, no_pw, 
                                            dev, status);
@@ -1252,7 +1115,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
 
        DEBUG(5, ("making a connection to 'normal' service %s\n", service));
 
-       return make_connection_snum(sconn, snum, vuser,
+       return make_connection_smb1(sconn, snum, vuser,
                                    password,
                                    dev, status);
 }
@@ -1273,7 +1136,8 @@ void close_cnum(connection_struct *conn, uint16 vuid)
 
        DEBUG(IS_IPC(conn)?3:1, ("%s (%s) closed connection to service %s\n",
                                 get_remote_machine_name(),
-                                conn->sconn->client_id.addr,
+                                tsocket_address_string(conn->sconn->remote_address,
+                                                       talloc_tos()),
                                 lp_servicename(SNUM(conn))));
 
        /* Call VFS disconnect hook */    
@@ -1289,11 +1153,11 @@ void close_cnum(connection_struct *conn, uint16 vuid)
            change_to_user(conn, vuid))  {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->session_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->session_info->utok.gid,
-                                       conn->session_info->sanitized_username,
-                                       conn->session_info->info3->base.domain.string,
+                                       conn->session_info->unix_token->gid,
+                                       conn->session_info->unix_info->sanitized_username,
+                                       conn->session_info->info->domain_name,
                                        lp_postexec(SNUM(conn)));
                smbrun(cmd,NULL);
                TALLOC_FREE(cmd);
@@ -1305,11 +1169,11 @@ void close_cnum(connection_struct *conn, uint16 vuid)
        if (*lp_rootpostexec(SNUM(conn)))  {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->session_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->session_info->utok.gid,
-                                       conn->session_info->sanitized_username,
-                                       conn->session_info->info3->base.domain.string,
+                                       conn->session_info->unix_token->gid,
+                                       conn->session_info->unix_info->sanitized_username,
+                                       conn->session_info->info->domain_name,
                                        lp_rootpostexec(SNUM(conn)));
                smbrun(cmd,NULL);
                TALLOC_FREE(cmd);