s3-auth: Remove security=share (depricated since 3.6).
[kai/samba.git] / source3 / smbd / service.c
index 5ade8270d5d64fa7c625b0cdcc281420f151a217..c53323381ead741880e1d219b79a3877eedbee91 100644 (file)
@@ -2,45 +2,47 @@
    Unix SMB/CIFS implementation.
    service (connection) opening and closing
    Copyright (C) Andrew Tridgell 1992-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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;
 
 static bool canonicalize_connect_path(connection_struct *conn)
 {
-#ifdef REALPATH_TAKES_NULL
        bool ret;
-       char *resolved_name = SMB_VFS_REALPATH(conn,conn->connectpath,NULL);
+       char *resolved_name = SMB_VFS_REALPATH(conn,conn->connectpath);
        if (!resolved_name) {
                return false;
        }
        ret = set_conn_connectpath(conn,resolved_name);
        SAFE_FREE(resolved_name);
        return ret;
-#else
-        char resolved_name_buf[PATH_MAX+1];
-       char *resolved_name = SMB_VFS_REALPATH(conn,conn->connectpath,resolved_name_buf);
-       if (!resolved_name) {
-               return false;
-       }
-       return set_conn_connectpath(conn,resolved_name);
-#endif /* REALPATH_TAKES_NULL */
 }
 
 /****************************************************************************
@@ -56,7 +58,12 @@ bool set_conn_connectpath(connection_struct *conn, const char *connectpath)
        const char *s = connectpath;
         bool start_of_name_component = true;
 
-       destname = SMB_STRDUP(connectpath);
+       if (connectpath == NULL || connectpath[0] == '\0') {
+               return false;
+       }
+
+       /* Allocate for strlen + '\0' + possible leading '/' */
+       destname = (char *)SMB_MALLOC(strlen(connectpath) + 2);
        if (!destname) {
                return false;
        }
@@ -178,12 +185,12 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir)
        conn->lastused_count++;
 
        snum = SNUM(conn);
-  
+
        if (do_chdir &&
            vfs_ChDir(conn,conn->connectpath) != 0 &&
            vfs_ChDir(conn,conn->origpath) != 0) {
-               DEBUG(0,("chdir (%s) failed\n",
-                        conn->connectpath));
+                DEBUG(((errno!=EACCES)?0:3),("chdir (%s) failed, reason: %s\n",
+                         conn->connectpath, strerror(errno)));
                return(False);
        }
 
@@ -193,7 +200,7 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir)
 
        last_conn = conn;
        last_flags = flags;
-       
+
        /* Obey the client case sensitivity requests - only for clients that support it. */
        switch (lp_casesensitive(snum)) {
                case Auto:
@@ -218,213 +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.
+ do some basic sainity checks on the share.  
+ This function modifies dev, ecode.
 ****************************************************************************/
 
-int add_home_service(const char *service, const char *username, const char *homedir)
-{
-       int iHomeService;
-
-       if (!service || !homedir)
-               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(fstring service)
+static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address,
+                                   const char *rhost,
+                                   int snum,
+                                   fstring dev)
 {
-       int iService;
-       struct smbd_server_connection *sconn = smbd_server_conn;
-
-       all_string_sub(service,"\\","/",0);
-
-       iService = lp_servicenumber(service);
-
-       /* now handle the special case of a home directory */
-       if (iService < 0) {
-               char *phome_dir = get_user_home_dir(talloc_tos(), service);
-
-               if(!phome_dir) {
-                       /*
-                        * Try mapping the servicename, it may
-                        * be a Windows to unix mapped user name.
-                        */
-                       if(map_username(sconn, service))
-                               phome_dir = get_user_home_dir(
-                                       talloc_tos(), service);
-               }
-
-               DEBUG(3,("checking for home directory %s gave %s\n",service,
-                       phome_dir?phome_dir:"(NULL)"));
-
-               iService = add_home_service(service,service /* '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) {
-                       DEBUG(3,("checking whether %s is a valid printer name...\n", service));
-                       if (pcap_printername_ok(service)) {
-                               DEBUG(3,("%s is a valid printer name\n", service));
-                               DEBUG(3,("adding %s as a printer service\n", service));
-                               lp_add_printer(service, iPrinterService);
-                               iService = lp_servicenumber(service);
-                               if (iService < 0) {
-                                       DEBUG(0,("failed to add %s as a printer service!\n", service));
-                               }
-                       } else {
-                               DEBUG(3,("%s is not a valid printer name\n", service));
-                       }
-               }
-       }
-
-       /* Check for default vfs service?  Unsure whether to implement this */
-       if (iService < 0) {
-       }
-
-       if (iService < 0) {
-               iService = load_registry_service(service);
-       }
-
-       /* Is it a usershare service ? */
-       if (iService < 0 && *lp_usershare_path()) {
-               /* Ensure the name is canonicalized. */
-               strlower_m(service);
-               iService = load_usershare_service(service);
-       }
-
-       /* just possibly it's a default service? */
-       if (iService < 0) {
-               char *pdefservice = lp_defaultservice();
-               if (pdefservice && *pdefservice && !strequal(pdefservice,service) && !strstr_m(service,"..")) {
-                       /*
-                        * 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 = SMB_STRDUP(pdefservice);
-
-                       if (!defservice) {
-                               goto fail;
-                       }
-
-                       /* Disallow anything except explicit share names. */
-                       if (strequal(defservice,HOMES_NAME) ||
-                                       strequal(defservice, PRINTERS_NAME) ||
-                                       strequal(defservice, "IPC$")) {
-                               SAFE_FREE(defservice);
-                               goto fail;
-                       }
-
-                       iService = find_service(defservice);
-                       if (iService >= 0) {
-                               all_string_sub(service, "_","/",0);
-                               iService = lp_add_service(service, iService);
-                       }
-                       SAFE_FREE(defservice);
-               }
-       }
+       char *raddr;
 
-       if (iService >= 0) {
-               if (!VALID_SNUM(iService)) {
-                       DEBUG(0,("Invalid snum %d for %s\n",iService, service));
-                       iService = -1;
-               }
+       raddr = tsocket_address_inet_addr_string(remote_address,
+                                                talloc_tos());
+       if (raddr == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-  fail:
-
-       if (iService < 0)
-               DEBUG(3,("find_service() failed to find service %s\n", service));
-
-       return (iService);
-}
-
-
-/****************************************************************************
- do some basic sainity checks on the share.  
- This function modifies dev, ecode.
-****************************************************************************/
-
-static NTSTATUS share_sanity_checks(int snum, fstring dev) 
-{
-       
-       if (!lp_snum_ok(snum) || 
-           !check_access(smbd_server_fd(), 
-                         lp_hostsallow(snum), lp_hostsdeny(snum))) {    
+       if (!lp_snum_ok(snum) ||
+           !allow_access(lp_hostsdeny(snum), lp_hostsallow(snum),
+                         rhost, raddr)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
@@ -469,12 +290,12 @@ static NTSTATUS share_sanity_checks(int snum, fstring dev)
 
 static NTSTATUS find_forced_group(bool force_user,
                                  int snum, const char *username,
-                                 DOM_SID *pgroup_sid,
+                                 struct dom_sid *pgroup_sid,
                                  gid_t *pgid)
 {
        NTSTATUS result = NT_STATUS_NO_SUCH_GROUP;
        TALLOC_CTX *frame = talloc_stackframe();
-       DOM_SID group_sid;
+       struct dom_sid group_sid;
        enum lsa_SidType type;
        char *groupname;
        bool user_must_be_member = False;
@@ -554,48 +375,47 @@ 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_server_info(struct smbd_server_connection *sconn,
+static NTSTATUS create_connection_session_info(struct smbd_server_connection *sconn,
                                              TALLOC_CTX *mem_ctx, int snum,
-                                              struct auth_serversupplied_info *vuid_serverinfo,
-                                             DATA_BLOB password,
-                                              struct auth_serversupplied_info **presult)
+                                              struct auth_session_info *session_info,
+                                              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) {
+        if (session_info != 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(session_info, 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,
-                                          pdb_get_domain(vuid_serverinfo->sam_account),
-                                           vuid_serverinfo->ptok, snum)) {
+                        if (!user_ok_token(session_info->unix_info->unix_name,
+                                          session_info->info->domain_name,
+                                           session_info->security_token, snum)) {
                                 DEBUG(2, ("user '%s' (from session setup) not "
                                           "permitted to access this share "
                                           "(%s)\n",
-                                          vuid_serverinfo->unix_name,
+                                          session_info->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, session_info);
                if (result == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -604,97 +424,159 @@ static NTSTATUS create_connection_server_info(struct smbd_server_connection *sco
                return NT_STATUS_OK;
         }
 
-        if (lp_security() == SEC_SHARE) {
+       DEBUG(0, ("invalid VUID (vuser)\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)) {
 
-                fstring user;
+               /*
+                * 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;
 
-                /* add the sharename as a possible user name if we
-                   are in share mode security */
+               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;
 
-                add_session_user(sconn, lp_servicename(snum));
+               status = make_session_info_from_username(
+                       conn, fuser,
+                       guest,
+                       &forced_serverinfo);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
 
-                /* shall we let them in? */
+               TALLOC_FREE(conn->session_info);
+               conn->session_info = forced_serverinfo;
 
-                if (!authorise_login(sconn, snum,user,password,&guest)) {
-                        DEBUG( 2, ( "Invalid username/password for [%s]\n",
-                                    lp_servicename(snum)) );
-                       return NT_STATUS_WRONG_PASSWORD;
-                }
+               conn->force_user = true;
+               DEBUG(3,("Forced user %s\n", fuser));
+       }
 
-               return make_serverinfo_from_username(mem_ctx, user, guest,
-                                                    presult);
-        }
+       /*
+        * If force group is true, then override
+        * any groupid stored for the connecting user.
+        */
 
-       DEBUG(0, ("invalid VUID (vuser) but not in security=share\n"));
-       return NT_STATUS_ACCESS_DENIED;
+       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;
 }
 
+/****************************************************************************
+  Setup the share access mask for a connection.
+****************************************************************************/
+
+static void create_share_access_mask(connection_struct *conn, int snum)
+{
+       const struct security_token *token = conn->session_info->security_token;
+
+       share_access_check(token,
+                       lp_servicename(snum),
+                       MAXIMUM_ALLOWED_ACCESS,
+                       &conn->share_access);
+
+       if (security_token_has_privilege(token, SEC_PRIV_SECURITY)) {
+               conn->share_access |= SEC_FLAG_SYSTEM_SECURITY;
+       }
+       if (security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
+               conn->share_access |= (SEC_RIGHTS_PRIV_RESTORE);
+       }
+       if (security_token_has_privilege(token, SEC_PRIV_BACKUP)) {
+               conn->share_access |= (SEC_RIGHTS_PRIV_BACKUP);
+       }
+       if (security_token_has_privilege(token, SEC_PRIV_TAKE_OWNERSHIP)) {
+               conn->share_access |= (SEC_STD_WRITE_OWNER);
+       }
+}
 
 /****************************************************************************
   Make a connection, given the snum to connect to, and the vuser of the
   connecting user if appropriate.
 ****************************************************************************/
 
-static connection_struct *make_connection_snum(
-                                       struct smbd_server_connection *sconn,
+static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
+                                       connection_struct *conn,
                                        int snum, user_struct *vuser,
-                                       DATA_BLOB password,
-                                       const char *pdev,
-                                       NTSTATUS *pstatus)
+                                       const char *pdev)
 {
-       connection_struct *conn;
-       SMB_STRUCT_STAT st;
+       struct smb_filename *smb_fname_cpath = NULL;
        fstring dev;
        int ret;
-       char addr[INET6_ADDRSTRLEN];
        bool on_err_call_dis_hook = false;
+       bool claimed_connection = false;
+       uid_t effuid;
+       gid_t effgid;
        NTSTATUS status;
 
        fstrcpy(dev, pdev);
-       SET_STAT_INVALID(st);
 
-       if (NT_STATUS_IS_ERR(*pstatus = share_sanity_checks(snum, dev))) {
-               return NULL;
-       }       
-
-       conn = conn_new(sconn);
-       if (!conn) {
-               DEBUG(0,("Couldn't find free connection.\n"));
-               *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
-               return NULL;
+       status = share_sanity_checks(sconn->remote_address,
+                                      sconn->remote_hostname,
+                                      snum,
+                                      dev);
+       if (NT_STATUS_IS_ERR(status)) {
+               goto err_root_exit;
        }
 
        conn->params->service = snum;
 
-       status = create_connection_server_info(sconn,
-               conn, snum, vuser ? vuser->server_info : NULL, password,
-               &conn->server_info);
+       status = create_connection_session_info(sconn,
+               conn, snum, vuser ? vuser->session_info : NULL,
+               &conn->session_info);
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("create_connection_server_info failed: %s\n",
+               DEBUG(1, ("create_connection_session_info failed: %s\n",
                          nt_errstr(status)));
-               *pstatus = status;
-               conn_free(sconn, conn);
-               return NULL;
+               goto err_root_exit;
        }
 
-       if ((lp_guest_only(snum)) || (lp_security() == SEC_SHARE)) {
+       if (lp_guest_only(snum)) {
                conn->force_user = true;
        }
 
-       add_session_user(sconn, conn->server_info->unix_name);
-
-       safe_strcpy(conn->client_address,
-                       client_addr(get_client_fd(),addr,sizeof(addr)), 
-                       sizeof(conn->client_address)-1);
        conn->num_files_open = 0;
        conn->lastused = conn->lastused_count = time(NULL);
        conn->used = True;
        conn->printer = (strncmp(dev,"LPT",3) == 0);
        conn->ipc = ( (strncmp(dev,"IPC",3) == 0) ||
                      ( lp_enable_asu_support() && strequal(dev,"ADMIN$")) );
-       conn->dirptr = NULL;
 
        /* Case options for the share. */
        if (lp_casesensitive(snum) == Auto) {
@@ -714,94 +596,34 @@ static connection_struct *make_connection_snum(
        conn->hide_list = NULL;
        conn->veto_oplock_list = NULL;
        conn->aio_write_behind_list = NULL;
-       string_set(&conn->dirpath,"");
 
        conn->read_only = lp_readonly(SNUM(conn));
-       conn->admin_user = False;
-
-       if (*lp_force_user(snum)) {
-
-               /*
-                * Replace conn->server_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) {
-                       conn_free(sconn, conn);
-                       *pstatus = NT_STATUS_NO_MEMORY;
-                       return NULL;
-               }
-
-               status = make_serverinfo_from_username(
-                       conn, fuser, conn->server_info->guest,
-                       &forced_serverinfo);
-               if (!NT_STATUS_IS_OK(status)) {
-                       conn_free(sconn, conn);
-                       *pstatus = status;
-                       return NULL;
-               }
-
-               TALLOC_FREE(conn->server_info);
-               conn->server_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->server_info->unix_name,
-                       &conn->server_info->ptok->user_sids[1],
-                       &conn->server_info->utok.gid);
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       conn_free(sconn, conn);
-                       *pstatus = status;
-                       return NULL;
-               }
-
-               /*
-                * We need to cache this gid, to use within
-                * change_to_user() separately from the conn->server_info
-                * struct. We only use conn->server_info directly if
-                * "force_user" was set.
-                */
-               conn->force_group_gid = conn->server_info->utok.gid;
+       status = set_conn_force_user_group(conn, snum);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto err_root_exit;
        }
 
-       conn->vuid = (vuser != NULL) ? vuser->vuid : UID_FIELD_INVALID;
+       conn->vuid = vuser->vuid;
 
        {
                char *s = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->server_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->server_info->utok.gid,
-                                       conn->server_info->sanitized_username,
-                                       pdb_get_domain(conn->server_info->sam_account),
+                                       conn->session_info->unix_token->gid,
+                                       conn->session_info->unix_info->sanitized_username,
+                                       conn->session_info->info->domain_name,
                                        lp_pathname(snum));
                if (!s) {
-                       conn_free(sconn, conn);
-                       *pstatus = NT_STATUS_NO_MEMORY;
-                       return NULL;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto err_root_exit;
                }
 
                if (!set_conn_connectpath(conn,s)) {
                        TALLOC_FREE(s);
-                       conn_free(sconn, conn);
-                       *pstatus = NT_STATUS_NO_MEMORY;
-                       return NULL;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto err_root_exit;
                }
                DEBUG(3,("Connect path is '%s' for service [%s]\n",s,
                         lp_servicename(snum)));
@@ -815,28 +637,19 @@ static connection_struct *make_connection_snum(
         *
         */
 
-       {
-               bool can_write = False;
-
-               can_write = share_access_check(conn->server_info->ptok,
-                                              lp_servicename(snum),
-                                              FILE_WRITE_DATA);
-
-               if (!can_write) {
-                       if (!share_access_check(conn->server_info->ptok,
-                                               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)));
-                               conn_free(sconn, conn);
-                               *pstatus = NT_STATUS_ACCESS_DENIED;
-                               return NULL;
-                       } else {
-                               conn->read_only = True;
-                       }
+       create_share_access_mask(conn, snum);
+
+       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)));
+                       status = NT_STATUS_ACCESS_DENIED;
+                       goto err_root_exit;
+               } else {
+                       conn->read_only = True;
                }
        }
        /* Initialise VFS function pointers */
@@ -844,38 +657,15 @@ static connection_struct *make_connection_snum(
        if (!smbd_vfs_init(conn)) {
                DEBUG(0, ("vfs_init failed for service %s\n",
                          lp_servicename(snum)));
-               conn_free(sconn, conn);
-               *pstatus = NT_STATUS_BAD_NETWORK_NAME;
-               return NULL;
-       }
-
-       /*
-        * If widelinks are disallowed we need to canonicalise the connect
-        * path here to ensure we don't have any symlinks in the
-        * connectpath. We will be checking all paths on this connection are
-        * below this directory. We must do this after the VFS init as we
-        * depend on the realpath() pointer in the vfs table. JRA.
-        */
-       if (!lp_widelinks(snum)) {
-               if (!canonicalize_connect_path(conn)) {
-                       DEBUG(0, ("canonicalize_connect_path failed "
-                       "for service %s, path %s\n",
-                               lp_servicename(snum),
-                               conn->connectpath));
-                       conn_free(sconn, conn);
-                       *pstatus = NT_STATUS_BAD_NETWORK_NAME;
-                       return NULL;
-               }
+               status = NT_STATUS_BAD_NETWORK_NAME;
+               goto err_root_exit;
        }
 
-       if ((!conn->printer) && (!conn->ipc)) {
-               conn->notify_ctx = notify_init(conn, server_id_self(),
-                                              smbd_messaging_context(),
-                                              smbd_event_context(),
-                                              conn);
-       }
+/* ROOT Activities: */
+       /* explicitly check widelinks here so that we can correctly warn
+        * in the logs. */
+       widelinks_warning(snum);
 
-/* ROOT Activities: */ 
        /*
         * Enforce the max connections parameter.
         */
@@ -886,20 +676,52 @@ static connection_struct *make_connection_snum(
 
                DEBUG(1, ("Max connections (%d) exceeded for %s\n",
                          lp_max_connections(snum), lp_servicename(snum)));
-               conn_free(sconn, conn);
-               *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
-               return NULL;
-       }  
+               status = NT_STATUS_INSUFFICIENT_RESOURCES;
+               goto err_root_exit;
+       }
 
        /*
         * Get us an entry in the connections db
         */
-       if (!claim_connection(conn, lp_servicename(snum), 0)) {
+       if (!claim_connection(conn, lp_servicename(snum))) {
                DEBUG(1, ("Could not store connections entry\n"));
-               conn_free(sconn, conn);
-               *pstatus = NT_STATUS_INTERNAL_DB_ERROR;
-               return NULL;
-       }  
+               status = NT_STATUS_INTERNAL_DB_ERROR;
+               goto err_root_exit;
+       }
+       claimed_connection = true;
+
+       /* Invoke VFS make connection hook - this must be the first
+          filesystem operation that we do. */
+
+       if (SMB_VFS_CONNECT(conn, lp_servicename(snum),
+                           conn->session_info->unix_info->unix_name) < 0) {
+               DEBUG(0,("make_connection: VFS make connection failed!\n"));
+               status = NT_STATUS_UNSUCCESSFUL;
+               goto err_root_exit;
+       }
+
+       /* Any error exit after here needs to call the disconnect hook. */
+       on_err_call_dis_hook = true;
+
+       if ((!conn->printer) && (!conn->ipc)) {
+               conn->notify_ctx = notify_init(conn,
+                                              messaging_server_id(sconn->msg_ctx),
+                                              sconn->msg_ctx,
+                                              sconn->ev_ctx,
+                                              conn);
+       }
+
+       /*
+        * Fix compatibility issue pointed out by Volker.
+        * We pass the conn->connectpath to the preexec
+        * scripts as a parameter, so attempt to canonicalize
+        * it here before calling the preexec scripts.
+        * We ignore errors here, as it is possible that
+        * the conn->connectpath doesn't exist yet and
+        * the preexec scripts will create them.
+        */
+
+       (void)canonicalize_connect_path(conn);
 
        /* Preexecs are done here as they might make the dir we are to ChDir
         * to below */
@@ -907,11 +729,11 @@ static connection_struct *make_connection_snum(
        if (*lp_rootpreexec(snum)) {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->server_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->server_info->utok.gid,
-                                       conn->server_info->sanitized_username,
-                                       pdb_get_domain(conn->server_info->sam_account),
+                                       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);
@@ -919,10 +741,8 @@ static connection_struct *make_connection_snum(
                if (ret != 0 && lp_rootpreexec_close(snum)) {
                        DEBUG(1,("root preexec gave %d - failing "
                                 "connection\n", ret));
-                       yield_connection(conn, lp_servicename(snum));
-                       conn_free(sconn, conn);
-                       *pstatus = NT_STATUS_ACCESS_DENIED;
-                       return NULL;
+                       status = NT_STATUS_ACCESS_DENIED;
+                       goto err_root_exit;
                }
        }
 
@@ -930,15 +750,16 @@ static connection_struct *make_connection_snum(
        if (!change_to_user(conn, conn->vuid)) {
                /* No point continuing if they fail the basic checks */
                DEBUG(0,("Can't become connected user!\n"));
-               yield_connection(conn, lp_servicename(snum));
-               conn_free(sconn, conn);
-               *pstatus = NT_STATUS_LOGON_FAILURE;
-               return NULL;
+               status = NT_STATUS_LOGON_FAILURE;
+               goto err_root_exit;
        }
 
+       effuid = geteuid();
+       effgid = getegid();
+
        /* Remember that a different vuid can connect later without these
         * checks... */
-       
+
        /* Preexecs are done here as they might make the dir we are to ChDir
         * to below */
 
@@ -946,18 +767,18 @@ static connection_struct *make_connection_snum(
        if (*lp_preexec(snum)) {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->server_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->server_info->utok.gid,
-                                       conn->server_info->sanitized_username,
-                                       pdb_get_domain(conn->server_info->sam_account),
+                                       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);
                if (ret != 0 && lp_preexec_close(snum)) {
                        DEBUG(1,("preexec gave %d - failing connection\n",
                                 ret));
-                       *pstatus = NT_STATUS_ACCESS_DENIED;
+                       status = NT_STATUS_ACCESS_DENIED;
                        goto err_root_exit;
                }
        }
@@ -967,7 +788,33 @@ static connection_struct *make_connection_snum(
                afs_login(conn);
        }
 #endif
-       
+
+       /*
+        * we've finished with the user stuff - go back to root
+        * so the SMB_VFS_STAT call will only fail on path errors,
+        * not permission problems.
+        */
+       change_to_root_user();
+/* ROOT Activites: */
+
+       /*
+        * If widelinks are disallowed we need to canonicalise the connect
+        * path here to ensure we don't have any symlinks in the
+        * connectpath. We will be checking all paths on this connection are
+        * below this directory. We must do this after the VFS init as we
+        * depend on the realpath() pointer in the vfs table. JRA.
+        */
+       if (!lp_widelinks(snum)) {
+               if (!canonicalize_connect_path(conn)) {
+                       DEBUG(0, ("canonicalize_connect_path failed "
+                       "for service %s, path %s\n",
+                               lp_servicename(snum),
+                               conn->connectpath));
+                       status = NT_STATUS_BAD_NETWORK_NAME;
+                       goto err_root_exit;
+               }
+       }
+
        /* Add veto/hide lists */
        if (!IS_IPC(conn) && !IS_PRINT(conn)) {
                set_namearray( &conn->veto_list, lp_veto_files(snum));
@@ -976,29 +823,21 @@ static connection_struct *make_connection_snum(
                set_namearray( &conn->aio_write_behind_list,
                                lp_aio_write_behind(snum));
        }
-       
-       /* Invoke VFS make connection hook - do this before the VFS_STAT call
-          to allow any filesystems needing user credentials to initialize
-          themselves. */
-
-       if (SMB_VFS_CONNECT(conn, lp_servicename(snum),
-                           conn->server_info->unix_name) < 0) {
-               DEBUG(0,("make_connection: VFS make connection failed!\n"));
-               *pstatus = NT_STATUS_UNSUCCESSFUL;
+       status = create_synthetic_smb_fname(talloc_tos(), conn->connectpath,
+                                           NULL, NULL, &smb_fname_cpath);
+       if (!NT_STATUS_IS_OK(status)) {
                goto err_root_exit;
        }
 
-       /* Any error exit after here needs to call the disconnect hook. */
-       on_err_call_dis_hook = true;
-
        /* win2000 does not check the permissions on the directory
           during the tree connect, instead relying on permission
           check during individual operations. To match this behaviour
           I have disabled this chdir check (tridge) */
        /* the alternative is just to check the directory exists */
-       if ((ret = SMB_VFS_STAT(conn, conn->connectpath, &st)) != 0 ||
-           !S_ISDIR(st.st_ex_mode)) {
-               if (ret == 0 && !S_ISDIR(st.st_ex_mode)) {
+
+       if ((ret = SMB_VFS_STAT(conn, smb_fname_cpath)) != 0 ||
+           !S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
+               if (ret == 0 && !S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
                        DEBUG(0,("'%s' is not a directory, when connecting to "
                                 "[%s]\n", conn->connectpath,
                                 lp_servicename(snum)));
@@ -1008,35 +847,19 @@ static connection_struct *make_connection_snum(
                                 conn->connectpath, lp_servicename(snum),
                                 strerror(errno) ));
                }
-               *pstatus = NT_STATUS_BAD_NETWORK_NAME;
+               status = NT_STATUS_BAD_NETWORK_NAME;
                goto err_root_exit;
        }
+       conn->base_share_dev = smb_fname_cpath->st.st_ex_dev;
 
        string_set(&conn->origpath,conn->connectpath);
 
-#if SOFTLINK_OPTIMISATION
-       /* resolve any soft links early if possible */
-       if (vfs_ChDir(conn,conn->connectpath) == 0) {
-               TALLOC_CTX *ctx = talloc_tos();
-               char *s = vfs_GetWd(ctx,s);
-               if (!s) {
-                       *status = map_nt_error_from_unix(errno);
-                       goto err_root_exit;
-               }
-               if (!set_conn_connectpath(conn,s)) {
-                       *status = NT_STATUS_NO_MEMORY;
-                       goto err_root_exit;
-               }
-               vfs_ChDir(conn,conn->connectpath);
-       }
-#endif
-
        /* Figure out the characteristics of the underlying filesystem. This
         * assumes that all the filesystem mounted withing a share path have
         * the same characteristics, which is likely but not guaranteed.
         */
 
-       conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn);
+       conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn, &conn->ts_res);
 
        /*
         * Print out the 'connected as' stuff here as we need
@@ -1046,48 +869,108 @@ static connection_struct *make_connection_snum(
 
        if( DEBUGLVL( IS_IPC(conn) ? 3 : 1 ) ) {
                dbgtext( "%s (%s) ", get_remote_machine_name(),
-                        conn->client_address );
-               dbgtext( "%s", srv_is_signing_active(smbd_server_conn) ? "signed " : "");
+                        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->server_info->unix_name );
-               dbgtext( "(uid=%d, gid=%d) ", (int)geteuid(), (int)getegid() );
+                        conn->session_info->unix_info->unix_name );
+               dbgtext( "(uid=%d, gid=%d) ", (int)effuid, (int)effgid );
                dbgtext( "(pid %d)\n", (int)sys_getpid() );
        }
 
-       /* we've finished with the user stuff - go back to root */
-       change_to_root_user();
-       return(conn);
+       return status;
 
   err_root_exit:
 
-       change_to_root_user();
+       TALLOC_FREE(smb_fname_cpath);
+       /* We must exit this function as root. */
+       if (geteuid() != 0) {
+               change_to_root_user();
+       }
        if (on_err_call_dis_hook) {
                /* Call VFS disconnect hook */
                SMB_VFS_DISCONNECT(conn);
        }
-       yield_connection(conn, lp_servicename(snum));
-       conn_free(sconn, conn);
-       return NULL;
+       if (claimed_connection) {
+               yield_connection(conn, lp_servicename(snum));
+       }
+       return status;
 }
 
 /****************************************************************************
- Make a connection to a service.
+ 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,
+                                       const char *pdev,
+                                       NTSTATUS *pstatus)
+{
+       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;
+       }
+       *pstatus = make_connection_snum(sconn,
+                                       conn,
+                                       snum,
+                                       vuser,
+                                       pdev);
+       if (!NT_STATUS_IS_OK(*pstatus)) {
+               conn_free(conn);
+               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,
+                                       const char *pdev,
+                                       NTSTATUS *pstatus)
+{
+       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;
+       *pstatus = make_connection_snum(sconn,
+                                       conn,
+                                       tcon->snum,
+                                       vuser,
+                                       pdev);
+       if (!NT_STATUS_IS_OK(*pstatus)) {
+               conn_free(conn);
+               return NULL;
+       }
+       return conn;
+}
+
+/****************************************************************************
+ Make a connection to a service. External SMB1 interface.
  *
  * @param service 
 ****************************************************************************/
 
 connection_struct *make_connection(struct smbd_server_connection *sconn,
-                                  const char *service_in, DATA_BLOB password,
+                                  const char *service_in,
                                   const char *pdev, uint16 vuid,
                                   NTSTATUS *status)
 {
        uid_t euid;
        user_struct *vuser = NULL;
-       fstring service;
+       char *service = NULL;
        fstring dev;
        int snum = -1;
-       char addr[INET6_ADDRSTRLEN];
 
        fstrcpy(dev, pdev);
 
@@ -1104,14 +987,12 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
                return NULL;
        }
 
-       if(lp_security() != SEC_SHARE) {
-               vuser = get_valid_user_struct(sconn, vuid);
-               if (!vuser) {
-                       DEBUG(1,("make_connection: refusing to connect with "
-                                "no session setup\n"));
-                       *status = NT_STATUS_ACCESS_DENIED;
-                       return NULL;
-               }
+       vuser = get_valid_user_struct(sconn, vuid);
+       if (!vuser) {
+               DEBUG(1,("make_connection: refusing to connect with "
+                        "no session setup\n"));
+               *status = NT_STATUS_ACCESS_DENIED;
+               return NULL;
        }
 
        /* Logic to try and connect to the correct [homes] share, preferably
@@ -1124,59 +1005,44 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
        */
 
        if (strequal(service_in,HOMES_NAME)) {
-               if(lp_security() != SEC_SHARE) {
-                       DATA_BLOB no_pw = data_blob_null;
-                       if (vuser->homes_snum == -1) {
-                               DEBUG(2, ("[homes] share not available for "
-                                         "this user because it was not found "
-                                         "or created at session setup "
-                                         "time\n"));
-                               *status = NT_STATUS_BAD_NETWORK_NAME;
-                               return NULL;
-                       }
-                       DEBUG(5, ("making a connection to [homes] service "
-                                 "created at session setup time\n"));
-                       return make_connection_snum(sconn,
-                                                   vuser->homes_snum,
-                                                   vuser, no_pw, 
-                                                   dev, status);
-               } else {
-                       /* Security = share. Try with
-                        * current_user_info.smb_name as the username.  */
-                       if (*current_user_info.smb_name) {
-                               fstring unix_username;
-                               fstrcpy(unix_username,
-                                       current_user_info.smb_name);
-                               map_username(sconn, unix_username);
-                               snum = find_service(unix_username);
-                       } 
-                       if (snum != -1) {
-                               DEBUG(5, ("making a connection to 'homes' "
-                                         "service %s based on "
-                                         "security=share\n", service_in));
-                               return make_connection_snum(sconn,
-                                                           snum, NULL,
-                                                           password,
-                                                           dev, status);
-                       }
+               if (vuser->homes_snum == -1) {
+                       DEBUG(2, ("[homes] share not available for "
+                                 "this user because it was not found "
+                                 "or created at session setup "
+                                 "time\n"));
+                       *status = NT_STATUS_BAD_NETWORK_NAME;
+                       return NULL;
                }
-       } else if ((lp_security() != SEC_SHARE) && (vuser->homes_snum != -1)
+               DEBUG(5, ("making a connection to [homes] service "
+                         "created at session setup time\n"));
+               return make_connection_smb1(sconn,
+                                           vuser->homes_snum,
+                                           vuser,
+                                           dev, status);
+       } else if ((vuser->homes_snum != -1)
                   && strequal(service_in,
                               lp_servicename(vuser->homes_snum))) {
-               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, 
+                                           vuser,
                                            dev, status);
        }
-       
-       fstrcpy(service, service_in);
+
+       service = talloc_strdup(talloc_tos(), service_in);
+       if (!service) {
+               *status = NT_STATUS_NO_MEMORY;
+               return NULL;
+       }
 
        strlower_m(service);
 
-       snum = find_service(service);
+       snum = find_service(talloc_tos(), service, &service);
+       if (!service) {
+               *status = NT_STATUS_NO_MEMORY;
+               return NULL;
+       }
 
        if (snum < 0) {
                if (strequal(service,"IPC$") ||
@@ -1186,9 +1052,10 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
                        return NULL;
                }
 
-               DEBUG(0,("%s (%s) couldn't find service %s\n",
+               DEBUG(3,("%s (%s) couldn't find service %s\n",
                        get_remote_machine_name(),
-                       client_addr(get_client_fd(),addr,sizeof(addr)),
+                       tsocket_address_string(
+                               sconn->remote_address, talloc_tos()),
                        service));
                *status = NT_STATUS_BAD_NETWORK_NAME;
                return NULL;
@@ -1205,8 +1072,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,
-                                   password,
+       return make_connection_smb1(sconn, snum, vuser,
                                    dev, status);
 }
 
@@ -1214,8 +1080,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
  Close a cnum.
 ****************************************************************************/
 
-void close_cnum(struct smbd_server_connection *sconn,
-               connection_struct *conn, uint16 vuid)
+void close_cnum(connection_struct *conn, uint16 vuid)
 {
        file_close_conn(conn);
 
@@ -1227,7 +1092,8 @@ void close_cnum(struct smbd_server_connection *sconn,
 
        DEBUG(IS_IPC(conn)?3:1, ("%s (%s) closed connection to service %s\n",
                                 get_remote_machine_name(),
-                                conn->client_address,
+                                tsocket_address_string(conn->sconn->remote_address,
+                                                       talloc_tos()),
                                 lp_servicename(SNUM(conn))));
 
        /* Call VFS disconnect hook */    
@@ -1243,11 +1109,11 @@ void close_cnum(struct smbd_server_connection *sconn,
            change_to_user(conn, vuid))  {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->server_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->server_info->utok.gid,
-                                       conn->server_info->sanitized_username,
-                                       pdb_get_domain(conn->server_info->sam_account),
+                                       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);
@@ -1259,15 +1125,15 @@ void close_cnum(struct smbd_server_connection *sconn,
        if (*lp_rootpostexec(SNUM(conn)))  {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(SNUM(conn)),
-                                       conn->server_info->unix_name,
+                                       conn->session_info->unix_info->unix_name,
                                        conn->connectpath,
-                                       conn->server_info->utok.gid,
-                                       conn->server_info->sanitized_username,
-                                       pdb_get_domain(conn->server_info->sam_account),
+                                       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);
        }
 
-       conn_free(sconn, conn);
+       conn_free(conn);
 }